MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adding libgdiplus for mono, and making mono reference it.

Browse source 
svn path=/nixpkgs/trunk/; revision=31276
This commit is contained in:
Lluís Batlle i Rossell 2012-01-04 13:55:54 +00:00
parent 8046598a80
commit 25db5f1a9d
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/mono/default.nix
View file

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

3
pkgs/top-level/all-packages.nix
View file

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