Pinta still does not build (xbuild pkgconfig problems), but mono and gtk-sharp-2 build fine.

svn path=/nixpkgs/trunk/; revision=22322

4 files changed, 26 insertions, 14 deletions

diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index c9dbf24c9b55..55ba1b6bb3ac 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -1,17 +1,29 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+{stdenv, fetchgit, mono, gtksharp, pkgconfig, automake, autoconf}:
 
 stdenv.mkDerivation {
-  name = "pinta-0.3";
+  name = "pinta-20100617";
 
   builder = ./builder.sh;
-  src = fetchurl {
-    url = http://download.github.com/jpobst-Pinta-0.3-0-g94f6e82.tar.gz;
-    sha256 = "0qvpz9602igjmv8ba6vc4kg9jj3yyw0frl7wgz62hdxiizdfhm2f";
+
+  src = fetchgit {
+    url = http://github.com/jpobst/Pinta.git;
+    rev = "c8ce06fc14a42083749b6400ed57d3883820d368";
+    sha256 = "9df96b69b08567045e9100e228047d7711db28705bd2badc0afc316e63c15505";
   };
 
   makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
 
-  buildInputs = [mono gtksharp pkgconfig];
+  configurePhase = ''
+    sh ./autogen.sh --prefix=$out
+  '';
+
+  makePhase = ''
+    HOME=`pwd`/tmphome
+    mkdir -p $HOME
+    xbuild Pinta.Core/Pinta.Core.csproj /v:diag
+  '';
+
+  buildInputs = [mono gtksharp pkgconfig automake autoconf];
 
   inherit gtksharp;
 }
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index fbbaf72fe7d9..1fcdb3e4c0bd 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
 
 stdenv.mkDerivation {
-  name = "mono-2.4.2.1";
+  name = "mono-2.6.4";
   src = fetchurl {
-    url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.1.tar.bz2;
-    sha256 = "0cbg29fz5xnyjmznwzsmaxrr0cxqisyxk7jx7m56p3zzr379f0f5";
+    url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.6.4.tar.bz2;
+    sha256 = "08krrl9zdigzxxa10c9scy518301l20xmw6dc2w8s0rvrhxryny0";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl];
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index cd2adfdd66b5..4405376493ac 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -16,15 +16,15 @@
 }:
 
 stdenv.mkDerivation {
-  name = "gtk-sharp-1.9.2";
+  name = "gtk-sharp-2.12.9";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/gtk-sharp-1.9.2.tar.gz;
-    md5 = "b7c5afab5f736ffa4011974302831363";
+    url = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.9.tar.gz;
+    sha256 = "1wh8zh960s4gq3cs11ys6p1ssblhpj2m8nm4xwv2s3bi7wbmcclh";
   };
 
-  patches = [ ./dllmap-glue.patch ];
+  # patches = [ ./dllmap-glue.patch ];
 
   buildInputs = [
     pkgconfig mono glib pango gtk GConf libglade libgnomecanvas
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21833829b3f3..5b54952b9e10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8470,7 +8470,7 @@ let
   };
 
   pinta = import ../applications/graphics/pinta {
-    inherit fetchurl stdenv mono pkgconfig;
+    inherit fetchgit stdenv mono pkgconfig automake autoconf;
     gtksharp = gtksharp2;
   };