Attempt at adding 'pinta'. It still does not build due to mono problems.

Nevertheless, I updated the gnome attribute names a bit so all that
gtk-sharp-2 goes a bit beyond.

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

6 files changed, 49 insertions, 11 deletions

diff --git a/pkgs/applications/graphics/pinta/builder.sh b/pkgs/applications/graphics/pinta/builder.sh
new file mode 100644
index 000000000000..bcea7a7a89af
--- /dev/null
+++ b/pkgs/applications/graphics/pinta/builder.sh
@@ -0,0 +1,20 @@
+source $stdenv/setup
+source $makeWrapper
+
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$out"
+    done
+}
+
+genericBuild
+
+
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
new file mode 100644
index 000000000000..c9dbf24c9b55
--- /dev/null
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "pinta-0.3";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://download.github.com/jpobst-Pinta-0.3-0-g94f6e82.tar.gz;
+    sha256 = "0qvpz9602igjmv8ba6vc4kg9jj3yyw0frl7wgz62hdxiizdfhm2f";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  buildInputs = [mono gtksharp pkgconfig];
+
+  inherit gtksharp;
+}
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 06aaae06aefc..e1c4154e01e4 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -9,11 +9,7 @@ rec {
   startupnotification = startup_notification;
   gnomedocutils = gnome_doc_utils;
   gnomeicontheme = gnome_icon_theme;
-
-  # !!! Missing! Need to add these.
-  gnomepanel = throw "gnomepanel not implemented";
-  gtksourceview_24 = gtksourceview;
-
+  gnomepanel = gnome_panel;
 
 #### PLATFORM
 
@@ -206,7 +202,7 @@ rec {
   };
 
   libgweather = import ./desktop/libgweather {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2;
+    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1;
     inherit (pkgs.gtkLibs) gtk;
     inherit intltool GConf libsoup;
   };
@@ -264,7 +260,7 @@ rec {
   };
 
   gnome_panel = import ./desktop/gnome-panel {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt;
+    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1;
     libxml2 = pkgs.libxml2Python;
     inherit (pkgs.gtkLibs) glib gtk pango atk;
     inherit (pkgs.xlibs) libXau;
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
index a240b8fba381..48b2ca2f8eff 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python
 , glib, gtk, pango, atk, libXau
 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
-, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl}:
+, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
 
 stdenv.mkDerivation {
   name = "gnome-panel-2.28.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau
                   intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop 
-		  libwnck librsvg libgweather gnome_doc_utils ];
+		  libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
   configureFlags = "--disable-scrollkeeper";
   CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+
              "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
index 9ed8eb38d147..45aaf5c3d2fa 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}:
+{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1}:
 
 assert stdenv ? glibc;
 
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
     sha256 = "0m4ncqzf13037zvyihydif1asgp6pnzdkmx5qnmffzb1gd6qxzb5";
   };
   configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo";
-  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup ];
+  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87d20d2803b1..dcda102b931b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8463,6 +8463,11 @@ let
     inherit fetchurl stdenv ncurses readline;
   };
 
+  pinta = import ../applications/graphics/pinta {
+    inherit fetchurl stdenv mono pkgconfig;
+    gtksharp = gtksharp2;
+  };
+
   pqiv = import ../applications/graphics/pqiv {
     inherit fetchurl stdenv getopt which pkgconfig;
     inherit (gtkLibs) gtk;