diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-17 09:55:32 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-17 09:55:32 +0100 |
| commit | a0bf07827bbf031d90ecb03f4e7345576208214a (patch) | |
| tree | d61d526b3d4cd15946428da59ae80fbd921dbf35 /pkgs/stdenv | |
| parent | edcda996377719342ab9e335af570afc65058d26 (diff) | |
| download | nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.gz nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.bz2 nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.lz nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.xz nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.tar.zst nixlib-a0bf07827bbf031d90ecb03f4e7345576208214a.zip | |
mpc: also rename the attribute to libmpc
Attrnames and package names should be as close as possible to avoid confusion. I took care not to confuse the two mpc things during the mass-replace, so hopefully I suceeded (tarball still builds).
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index f1b5ae0dd1e0..e82338450688 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -207,7 +207,7 @@ rec { # reduces the size of the stdenv closure. gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - mpc = pkgs.mpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; + libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; isl = pkgs.isl.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; cloog = pkgs.cloog.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gccPlain = pkgs.gcc.cc; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index 90f89cc0c784..1d2919919b1e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -81,7 +81,7 @@ let cloog = pkgs.cloog.crossDrv; zlib = pkgs.zlib.crossDrv; isl = pkgs.isl.crossDrv; - mpc = pkgs.mpc.crossDrv; + libmpc = pkgs.libmpc.crossDrv; binutils = pkgs.binutils.crossDrv; klibc = pkgs.linuxPackages.klibc.crossDrv; @@ -188,7 +188,7 @@ rec { cp -d ${cloog}/lib/libcloog*.so* $out/lib cp -d ${ppl}/lib/libppl*.so* $out/lib cp -d ${isl}/lib/libisl*.so* $out/lib - cp -d ${mpc}/lib/libmpc*.so* $out/lib + cp -d ${libmpc}/lib/libmpc*.so* $out/lib cp -d ${zlib}/lib/libz.so* $out/lib # Copy binutils. diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 16a1d513afe3..a836f6fdd378 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -113,7 +113,7 @@ rec { cp -d ${gmpxx}/lib/libgmp*.so* $out/lib cp -d ${mpfr}/lib/libmpfr*.so* $out/lib - cp -d ${mpc}/lib/libmpc*.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 |