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/stdenv | |
| 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/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index ed7314878a6f..6b562eef53c2 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -201,7 +201,7 @@ rec { cp -d ${gmpxx}/lib/libgmp*.so* $out/lib cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib cp -d ${libmpc}/lib/libmpc*.so* $out/lib - cp -d ${zlib}/lib/libz.so* $out/lib + cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib # TBD: Why are these needed for cross but not native tools? diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 1011ae6689ad..d33d8f9fb663 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -114,7 +114,7 @@ rec { cp -d ${gmpxx}/lib/libgmp*.so* $out/lib cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib cp -d ${libmpc}/lib/libmpc*.so* $out/lib - cp -d ${zlib}/lib/libz.so* $out/lib + cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib # Copy binutils. |