JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix building libgdiplus with libpng15.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32826
This commit is contained in:
Eelco Dolstra 2012-03-06 13:49:37 +00:00
parent ce5a0fdf68
commit b49ee92aa9
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -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
];
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };