diff --git a/pkgs/development/libraries/libpng/1.2.44.nix b/pkgs/development/libraries/libpng/1.2.44.nix deleted file mode 100644 index bfd0a6b98b1..00000000000 --- a/pkgs/development/libraries/libpng/1.2.44.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -assert zlib != null; - -stdenv.mkDerivation rec { - name = "libpng-1.2.44"; - - src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.gz"; - md5 = "89b62f8daaeeab1342e307d6d1411ff1"; - }; - - propagatedBuildInputs = [ zlib ]; - - passthru = { inherit zlib; }; - - meta = { - description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt - }; -} diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index bcdc878edf4..bfd0a6b98b1 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchurl, zlib }: + +assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.4"; + name = "libpng-1.2.44"; src = fetchurl { - url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1rw58zi3hxyinah2dz0jzq81c7ninbmfjf10xax2a8cpd5h45agz"; + url = "mirror://sourceforge/libpng/${name}.tar.gz"; + md5 = "89b62f8daaeeab1342e307d6d1411ff1"; }; propagatedBuildInputs = [ zlib ]; - buildNativeInputs = [ xz ]; - passthru = { inherit zlib; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2de383cdfd6..e9793292d62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3944,7 +3944,6 @@ let libpcap = callPackage ../development/libraries/libpcap { }; libpng = callPackage ../development/libraries/libpng { }; - libpng12 = callPackage ../development/libraries/libpng/1.2.44.nix { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libproxy = callPackage ../development/libraries/libproxy { };