libharu: fix build with libpng15 (upstream patches)
svn path=/nixpkgs/branches/libpng15/; revision=31882
This commit is contained in:
parent
38b10c30a1
commit
84b0c3de57
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, zlib, libpng }:
|
{ stdenv, fetchurl, zlib, libpng, patchutils }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "libharu-2.2.1";
|
name = "libharu-2.2.1";
|
||||||
@ -12,6 +12,26 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
buildInputs = [ zlib libpng ];
|
buildInputs = [ zlib libpng ];
|
||||||
|
|
||||||
|
patches =
|
||||||
|
[ (stdenv.mkDerivation {
|
||||||
|
name = "linpng15.patch";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
|
||||||
|
sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildNativeInputs = [ patchutils ];
|
||||||
|
|
||||||
|
buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
|
||||||
|
})
|
||||||
|
(fetchurl {
|
||||||
|
url = https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
|
||||||
|
name = "endless-loop.patch";
|
||||||
|
sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Cross platform, open source library for generating PDF files";
|
description = "Cross platform, open source library for generating PDF files";
|
||||||
homepage = http://libharu.org/wiki/Main_Page;
|
homepage = http://libharu.org/wiki/Main_Page;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user