From 25db5f1a9d49666486b49014d1eb7d9325172545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 4 Jan 2012 13:55:54 +0000
Subject: [PATCH] Adding libgdiplus for mono, and making mono reference it.

svn path=/nixpkgs/trunk/; revision=31276
---
 pkgs/development/compilers/mono/default.nix       |  6 ++++--
 pkgs/development/libraries/libgdiplus/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                   |  3 +++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libgdiplus/default.nix

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 471f0d5b36d1..8b85400f780e 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -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;
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
new file mode 100644
index 000000000000..27745cc209ad
--- /dev/null
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -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 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5e1de2532aa..debee6f072e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };