From 64fd0379c8b19d823c17c40fe545136f6377e2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 16 Feb 2013 18:00:28 +0100 Subject: [PATCH] libpng: reintroduce 1.5, some pkgs need older --- pkgs/development/libraries/libpng/15.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/libpng/15.nix diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix new file mode 100644 index 00000000000..b2a09254782 --- /dev/null +++ b/pkgs/development/libraries/libpng/15.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, zlib }: + +assert zlib != null; + +stdenv.mkDerivation rec { + name = "libpng-1.5.14"; + + src = fetchurl { + url = "mirror://sourceforge/libpng/${name}.tar.xz"; + sha256 = "0m3vz3gig7s63zanq5b1dgb5ph12qm0cylw4g4fbxlsq3f74hn8l"; + }; + + propagatedBuildInputs = [ zlib ]; + + doCheck = true; + + 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a13794cd9d4..ad6abc47430 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4431,6 +4431,7 @@ let libpng = callPackage ../development/libraries/libpng { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; + libpng15 = callPackage ../development/libraries/libpng/15.nix { }; libpaper = callPackage ../development/libraries/libpaper { };