diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:30:24 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:39 +0200 |
commit | ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d (patch) | |
tree | 854a52593238d080b5b63cd495e29c4e19b8b6ec /pkgs/applications | |
parent | 0f4244f51f1703132d9205a216180902a75bf33e (diff) | |
download | nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.gz nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.bz2 nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.lz nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.xz nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.zst nixlib-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.zip |
treewide: Mass replace 'zlib}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/milkytracker/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/texmacs/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 8bc0aebba5a8..f22ccd08a8e8 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; preBuild='' - export CPATH=${zlib}/lib + export CPATH=${zlib.out}/lib ''; buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ]; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index e415239d76fb..e51813459c6f 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { postFixup = '' bin="$out/libexec/TeXmacs/bin/texmacs.bin" rpath=$(patchelf --print-rpath "$bin") - patchelf --set-rpath "$rpath:${zlib}/lib" "$bin" + patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" ''; meta = { |