jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix zlib handling in stdenvLinux

Browse Source 
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.

Actually this have been committed once as 1f2b636, but then got lost
while resolving merge conflicts.  Hopefully it survives this time.
This commit is contained in:
Gergely Risko 2014-09-11 01:10:49 +02:00
parent 4ac4af08f2
commit 0a3d811e42
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/linux/default.nix
View File

@ -221,7 +221,11 @@ rec {
name = "";
};
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;
};
extraBuildInputs = [ stage3.pkgs.patchelf stage3.pkgs.xz ];
};
@ -272,7 +276,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;
};
};