From ff1fc5a19903a7ad92c6698d290ffada1c02e429 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 4 Jan 2019 19:33:50 +0000 Subject: multitran.libmtquery: link with libbtree explicitly --- pkgs/tools/text/multitran/libmtquery/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/tools/text') diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 153184bf70f3..8b2032dcaba5 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation { buildInputs = [ libmtsupport libfacet libbtree multitrandata ]; + NIX_LDFLAGS = [ + "-lbtree" + ]; + patchPhase = '' sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \ -- cgit 1.4.1 From eb411132703a7e92097df0ae98a74adbed0397f1 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 4 Jan 2019 19:33:51 +0000 Subject: qshowdiff: build with a c++ compiler --- pkgs/tools/text/qshowdiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/text') diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 761a498bcfb6..e3970c059027 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configurePhase = '' mkdir -p $out/{bin,man/man1} - makeFlags="PREFIX=$out" + makeFlags="PREFIX=$out CC=$CXX" ''; meta = { -- cgit 1.4.1