From b49ee92aa9abc945be08ba7858d5c738d0da7bf3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 6 Mar 2012 13:49:37 +0000
Subject: [PATCH] * Fix building libgdiplus with libpng15.
svn path=/nixpkgs/trunk/; revision=32826
---
.../libraries/libgdiplus/default.nix | 23 ++++++++++++++-----
pkgs/top-level/all-packages.nix | 4 +---
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 27745cc209ad..cfd61e4d56a4 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,15 +1,26 @@
{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig
-, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer,
-libXrender, libexif }:
+, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer
+, libXrender, libexif }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "libgdiplus-2.10";
src = fetchurl {
- url = http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2;
+ url = "http://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2";
sha256 = "190j6yvfbpg6bda4n7pdcf2dbqdvrb4dmz5abs2yv0smxybh77id";
};
- buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libungif
- libjpeg libpng libXrender libexif ];
+ patches =
+ [ (fetchurl {
+ url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-dotnet/libgdiplus/files/libgdiplus-2.10.1-libpng15.patch?revision=1.1;
+ sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f";
+ })
+ ];
+
+ patchFlags = "-p0";
+
+ buildInputs =
+ [ pkgconfig glib cairo fontconfig libtiff giflib libungif
+ libjpeg libpng libXrender libexif
+ ];
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f631179be4c3..972855ee232e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3997,9 +3997,7 @@ let
libgcrypt = callPackage ../development/libraries/libgcrypt { };
- libgdiplus = callPackage ../development/libraries/libgdiplus {
- libpng = pkgs.libpng12;
- };
+ libgdiplus = callPackage ../development/libraries/libgdiplus { };
libgpgerror = callPackage ../development/libraries/libgpg-error { };