diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
| commit | 10a12194e301f2ad3ff6899e022afa96af0610c8 (patch) | |
| tree | 9c33b65e84504d37635d942a91bc5aa0b075058d /pkgs/tools/text | |
| parent | 5489e49ebb5cb9b973133fcd70d3196fb12acc0b (diff) | |
| parent | 981b504ecddd981488578494304d141849697dba (diff) | |
| download | nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.gz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.bz2 nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.lz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.xz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.zst nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.zip | |
Merge #53490: fix treewide linking errors after #51770
Issue #53001. This might not be all of them, but let's not wait.
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/multitran/libmtquery/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/text/qshowdiff/default.nix | 2 |
2 files changed, 5 insertions, 1 deletions
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@' \ 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 = { |