summary refs log tree commit diff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-01-24 09:30:00 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-01-24 10:03:38 +0200
commit04c5830432165e60d5ef7bc77ea13618d9943fc5 (patch)
tree32a2f347b2bf0e76963b771d9d2fb9420bb73dcb
parent1894615f64502d66c2f5c4ad85e8ee50ee75cbf7 (diff)
downloadnixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar.gz
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar.bz2
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar.lz
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar.xz
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.tar.zst
nixlib-04c5830432165e60d5ef7bc77ea13618d9943fc5.zip
treewide: Mass replace 'mpfr}/lib' to refer the 'out' output
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools-cross.nix2
-rw-r--r--pkgs/stdenv/linux/make-bootstrap-tools.nix2
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 a56d744ab8d4..ed7314878a6f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -199,7 +199,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.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 ${libelf}/lib/libelf.so* $out/lib
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 117346eb4edc..abcba396c371 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,7 +112,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.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 ${libelf}/lib/libelf.so* $out/lib