* Merge zlib mac patch.

svn path=/nixpkgs/trunk/; revision=1445
This commit is contained in:
Eelco Dolstra
2004-09-18 17:58:42 +00:00
parent 1ab4a9324c
commit a801ea32a8
4 changed files with 4 additions and 20 deletions

View File

@@ -508,14 +508,9 @@ rec {
inherit fetchurl stdenv;
};
zlib = if stdenv.system == "powerpc-darwin" then
(import ../development/libraries/zlib-mac-fix) {
inherit fetchurl stdenv;
}
else
(import ../development/libraries/zlib) {
inherit fetchurl stdenv;
};
zlib = (import ../development/libraries/zlib) {
inherit fetchurl stdenv;
};
libjpeg = (import ../development/libraries/libjpeg) {
inherit fetchurl stdenv;