mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
Adding libgdiplus for mono, and making mono reference it.
svn path=/nixpkgs/trunk/; revision=31276
This commit is contained in:
parent
8046598a80
commit
25db5f1a9d
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
|
||||
{stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mono-2.10.8.1";
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0h4hdj99qg0nsg5260izwaybs59wysf7y399kffhg43fidpndz0x";
|
||||
};
|
||||
|
||||
buildInputs = [bison pkgconfig glib gettext perl];
|
||||
buildInputs = [bison pkgconfig glib gettext perl libgdiplus];
|
||||
propagatedBuildInputs = [glib];
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s" ;
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation {
|
||||
# To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
|
||||
dontDisableStatic = true;
|
||||
|
||||
configureFlags = "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so";
|
||||
|
||||
# Attempt to fix this error when running "mcs --version":
|
||||
# The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image
|
||||
dontStrip = true;
|
||||
|
15
pkgs/development/libraries/libgdiplus/default.nix
Normal file
15
pkgs/development/libraries/libgdiplus/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig
|
||||
, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer,
|
||||
libXrender, libexif }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libgdiplus-2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.mono-project.com/sources/libgdiplus/libgdiplus-2.10.tar.bz2;
|
||||
sha256 = "190j6yvfbpg6bda4n7pdcf2dbqdvrb4dmz5abs2yv0smxybh77id";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib cairo fontconfig libtiff giflib libungif
|
||||
libjpeg libpng libXrender libexif ];
|
||||
}
|
@ -3936,6 +3936,9 @@ let
|
||||
|
||||
libgcrypt = callPackage ../development/libraries/libgcrypt { };
|
||||
|
||||
libgdiplus = callPackage ../development/libraries/libgdiplus {
|
||||
};
|
||||
|
||||
libgpgerror = callPackage ../development/libraries/libgpg-error { };
|
||||
|
||||
libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
|
||||
|
Loading…
Reference in New Issue
Block a user