public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert previous commits related to libpng 1.2.44, until we are able to build 1.2.45

Browse Source 
svn path=/nixpkgs/trunk/; revision=29373
This commit is contained in:
Rob Vermaas 2011-09-19 23:05:02 +00:00
parent e0111c4232
commit 2c33be2d8b
3 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/libpng/1.2.44.nix
View File

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

12
pkgs/development/libraries/libpng/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, zlib, xz }: { stdenv, fetchurl, zlib }:
assert zlib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpng-1.5.4"; name = "libpng-1.2.44";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz"; url = "mirror://sourceforge/libpng/${name}.tar.gz";
sha256 = "1rw58zi3hxyinah2dz0jzq81c7ninbmfjf10xax2a8cpd5h45agz"; md5 = "89b62f8daaeeab1342e307d6d1411ff1";
}; };
propagatedBuildInputs = [ zlib ]; propagatedBuildInputs = [ zlib ];
buildNativeInputs = [ xz ];
passthru = { inherit zlib; }; passthru = { inherit zlib; };
meta = { meta = {

1
pkgs/top-level/all-packages.nix
View File

@ -3944,7 +3944,6 @@ let
libpcap = callPackage ../development/libraries/libpcap { }; libpcap = callPackage ../development/libraries/libpcap { };
libpng = callPackage ../development/libraries/libpng { }; libpng = callPackage ../development/libraries/libpng { };
libpng12 = callPackage ../development/libraries/libpng/1.2.44.nix { };
libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { }; libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix { };
libproxy = callPackage ../development/libraries/libproxy { }; libproxy = callPackage ../development/libraries/libproxy { };