Author: urkud
Date: Sun Jan 8 19:50:06 2012
New Revision: 31440
URL: https://nixos.org/websvn/nix/?rev=31440&sc=1
Log:
Restore libpng-1.2.x
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix
Modified:
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Added: nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix Sun Jan
8 19:50:06 2012 (r31440)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib, xz }:
+
+assert zlib != null;
+
+stdenv.mkDerivation rec {
+ name = "libpng-1.2.46";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libpng/${name}.tar.xz";
+ sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
+ };
+
+ propagatedBuildInputs = [ zlib ];
+
+ buildNativeInputs = [ xz ];
+
+ 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
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sun Jan 8
19:49:56 2012 (r31439)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sun Jan 8
19:50:06 2012 (r31440)
@@ -4069,6 +4069,7 @@
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix {
};
+ libpng12 = callPackage ../development/libraries/libpng/12.nix { };
libproxy = callPackage ../development/libraries/libproxy { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
