diff --git a/pkgs/development/libraries/zlib-mac-fix/default.nix b/pkgs/development/libraries/zlib-mac-fix/default.nix deleted file mode 100644 index d602e7a0d45..00000000000 --- a/pkgs/development/libraries/zlib-mac-fix/default.nix +++ /dev/null @@ -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]; -} diff --git a/pkgs/development/libraries/zlib-mac-fix/darwin.patch b/pkgs/development/libraries/zlib/darwin.patch similarity index 100% rename from pkgs/development/libraries/zlib-mac-fix/darwin.patch rename to pkgs/development/libraries/zlib/darwin.patch diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index ca7bc7c7e41..43b6fcb28e7 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -7,4 +7,5 @@ stdenv.mkDerivation { md5 = "ef1cb003448b4a53517b8f25adb12452"; }; configureFlags = "--shared"; + patches = [./darwin.patch]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index ff8a0b0909b..20af32d5c84 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/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;