Author: eelco
Date: Tue Mar 6 13:49:37 2012
New Revision: 32826
URL: https://nixos.org/websvn/nix/?rev=32826&sc=1
Log:
* Fix building libgdiplus with libpng15.
Modified:
nixpkgs/trunk/pkgs/development/libraries/libgdiplus/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/libgdiplus/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libgdiplus/default.nix Tue Mar
6 13:08:46 2012 (r32825)
+++ nixpkgs/trunk/pkgs/development/libraries/libgdiplus/default.nix Tue Mar
6 13:49:37 2012 (r32826)
@@ -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
+ ];
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 6 13:08:46
2012 (r32825)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 6 13:49:37
2012 (r32826)
@@ -3997,9 +3997,7 @@
libgcrypt = callPackage ../development/libraries/libgcrypt { };
- libgdiplus = callPackage ../development/libraries/libgdiplus {
- libpng = pkgs.libpng12;
- };
+ libgdiplus = callPackage ../development/libraries/libgdiplus { };
libgpgerror = callPackage ../development/libraries/libgpg-error { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
