* Merge zlib mac patch.

svn path=/nixpkgs/trunk/; revision=1445

pkgs/development/libraries/zlib-mac-fix/default.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl, patch}:
-
-stdenv.mkDerivation {
-  name = "zlib-1.2.1";
-  src = fetchurl {
-    url = http://www.gzip.org/zlib/zlib-1.2.1.tar.gz;
-    md5 = "ef1cb003448b4a53517b8f25adb12452";
-  };
-  configureFlags = "--shared";
-  patches = [./darwin.patch];
-  buildInputs = [patch];
-}

pkgs/development/libraries/zlib/default.nix

@@ -7,4 +7,5 @@ stdenv.mkDerivation {
     md5 = "ef1cb003448b4a53517b8f25adb12452";
   };
   configureFlags = "--shared";
+  patches = [./darwin.patch];
 }

pkgs/system/all-packages-generic.nix

@@ -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;