Author: urkud
Date: Fri Jan 27 15:05:35 2012
New Revision: 31882
URL: https://nixos.org/websvn/nix/?rev=31882&sc=1
Log:
libharu: fix build with libpng15 (upstream patches)
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/libharu/default.nix
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/libharu/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/libharu/default.nix
Fri Jan 27 14:40:58 2012 (r31881)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/libharu/default.nix
Fri Jan 27 15:05:35 2012 (r31882)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libpng }:
+{ stdenv, fetchurl, zlib, libpng, patchutils }:
stdenv.mkDerivation {
name = "libharu-2.2.1";
@@ -12,6 +12,26 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
