diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-27 15:05:35 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-27 15:05:35 +0000 |
| commit | 84b0c3de57c99f37631f97f3b08656c880b02c7e (patch) | |
| tree | fd8c4772fca4baa48c17227730a451a600a01809 /pkgs/development/libraries/libharu | |
| parent | 38b10c30a1cf78c4047d9776723d2e7323423906 (diff) | |
| download | nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar.gz nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar.bz2 nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar.lz nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar.xz nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.tar.zst nixpkgs-84b0c3de57c99f37631f97f3b08656c880b02c7e.zip | |
libharu: fix build with libpng15 (upstream patches)
svn path=/nixpkgs/branches/libpng15/; revision=31882
Diffstat (limited to 'pkgs/development/libraries/libharu')
| -rw-r--r-- | pkgs/development/libraries/libharu/default.nix | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 3e664ffd43a..3b8c4be54e0 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libpng }: +{ stdenv, fetchurl, zlib, libpng, patchutils }: stdenv.mkDerivation { name = "libharu-2.2.1"; @@ -12,6 +12,26 @@ stdenv.mkDerivation { 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 = { description = "Cross platform, open source library for generating PDF files"; homepage = http://libharu.org/wiki/Main_Page; |