diff options
author | Gergely Risko <errge@nilcons.com> | 2014-08-25 21:16:38 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-26 17:17:13 +0200 |
commit | 1f2b636ff62ed6df735c6ee187f495c6371d9283 (patch) | |
tree | e293aec41f6a291a170615e54977cd75e60a45c9 | |
parent | f5d648e27d1b31c91740d536a88e7d2c251aaf79 (diff) | |
download | nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar.gz nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar.bz2 nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar.lz nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar.xz nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.tar.zst nixlib-1f2b636ff62ed6df735c6ee187f495c6371d9283.zip |
Fix zlib handling in stdenvLinux
Previously stdenv depended on two different zlibs and there was a third one in the top-level package set for other purposes. This commit merges all this zlibs to one.
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 1daebd9dd361..6f8b42c2266a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -225,7 +225,11 @@ rec { }; extraPath = [ stage3.pkgs.xz ]; overrides = pkgs: { - inherit (stage3.pkgs) gettext gnum4 gmp perl glibc; + # Zlib has to be inherited and not rebuilt in this stage, + # because gcc (since JAR support) already depends on zlib, and + # then if we already have a zlib we want to use that for the + # other purposes (binutils and top-level pkgs) too. + inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib; }; }; @@ -274,7 +278,7 @@ rec { inherit (stage4.pkgs) gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf - attr acl paxctl; + attr acl paxctl zlib; }; }; |