libdevil: pick a couple of debian patches

svn path=/nixpkgs/trunk/; revision=31986
This commit is contained in:
Yury G. Kudryashov
2012-02-02 20:30:55 +00:00
parent 798890b819
commit 9758857fbe
2 changed files with 49 additions and 7 deletions
@@ -1,5 +1,6 @@
{ stdenv, fetchurl
, libjpeg ? null, libpng ? null, libmng ? null, lcms1 ? null, libtiff ? null, openexr ? null, mesa ? null, xlibs ? null }:
{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa
, libX11, pkgconfig }:
stdenv.mkDerivation rec {
name ="libdevil-${version}";
@@ -10,14 +11,24 @@ stdenv.mkDerivation rec {
sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8";
};
buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa xlibs.libX11 ];
buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ];
buildNativeInputs = [ pkgconfig ];
configureFlags = [ "--enable-ILU" "--enable-ILUT" ];
patches =
[ ( fetchurl {
url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff;
sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc";
} )
./ftbfs-libpng15.patch
];
meta = with stdenv.lib; {
homepage = http://openil.sourceforge.net/;
description = "An image library which can can load, save, convert, manipulate,
filter and display a wide variety of image formats.";
description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats";
license = licenses.lgpl2;
maintainers = [ maintainers.phreedom ];
platforms = platforms.all;
maintainers = [ maintainers.phreedom maintainers.urkud ];
};
}
}