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/development/tools/build-managers | |
| parent | 0f4244f51f1703132d9205a216180902a75bf33e (diff) | |
| download | nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.gz nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.bz2 nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.lz nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.xz nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.tar.zst nixpkgs-ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d.zip | |
treewide: Mass replace 'zlib}/lib' to refer the 'out' output
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/cargo/snapshot.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix index 8f5467f6311..5a061e4b7c8 100644 --- a/pkgs/development/tools/build-managers/cargo/snapshot.nix +++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ./install.sh "--prefix=$out" '' + (if stdenv.isLinux then '' patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \ - --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \ + --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \ "$out/bin/cargo" '' else "") + postInstall; } |