nixpkgs/pkgs
Gergely Risko 0a3d811e42 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.

Actually this have been committed once as 1f2b636, but then got lost
while resolving merge conflicts.  Hopefully it survives this time.
2014-09-14 19:37:51 +02:00
..
applications Merge recent master into staging 2014-09-13 21:48:29 +02:00
build-support Merge recent master into staging 2014-09-13 21:48:29 +02:00
data Merge recent master into staging 2014-09-13 21:48:29 +02:00
desktops Merge recent master into staging 2014-09-13 21:48:29 +02:00
development Merge recent master into staging 2014-09-13 21:48:29 +02:00
games Merge recent master into staging 2014-09-13 21:48:29 +02:00
misc Merge recent master into staging 2014-09-13 21:48:29 +02:00
os-specific Merge recent master into staging 2014-09-13 21:48:29 +02:00
servers Merge recent master into staging 2014-09-13 21:48:29 +02:00
shells
stdenv Fix zlib handling in stdenvLinux 2014-09-14 19:37:51 +02:00
test Merge recent master into staging 2014-09-13 21:48:29 +02:00
tools Merge recent master into staging 2014-09-13 21:48:29 +02:00
top-level Merge recent master into staging 2014-09-13 21:48:29 +02:00