* Added gtksourceview and gtksourceview-sharp.

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

pkgs/applications/editors/monodevelop/default.nix

@@ -1,7 +1,9 @@
-{stdenv, fetchurl, mono, gtksharp, perl, perlXMLParser, pkgconfig, glib, gconf, gnomevfs, libbonobo}:
+{ stdenv, fetchurl, mono, gtksharp, gtksourceviewsharp
+, perl, perlXMLParser, pkgconfig
+, glib, gconf, gnomevfs, libbonobo}:
 
 stdenv.mkDerivation {
-  name = "MonoDevelop-0.5.1";
+  name = "monodevelop-0.5.1";
   builder = ./builder.sh;
 
   src = fetchurl {
@@ -9,7 +11,9 @@ stdenv.mkDerivation {
     md5 = "d89458a2d909da09b2cc1f37e16d8990";
   };
 
-  buildInputs = [mono gtksharp perl pkgconfig gnomevfs glib libbonobo gconf];
+  buildInputs = [
+    mono gtksharp gtksourceviewsharp perl pkgconfig gnomevfs
+    glib libbonobo gconf
+  ];
   inherit perlXMLParser;
 }
-  

pkgs/development/libraries/gnome/default.nix

@@ -141,4 +141,11 @@ rec {
     inherit fetchurl stdenv pkgconfig glib gtk;
     input = desktop.gnomekeyring;
   };
+
+  gtksourceview = (import ./gtksourceview) {
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2
+            libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */
+            gconf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */;
+    input = desktop.gtksourceview;
+  };
 }

pkgs/development/libraries/gnome/gtksourceview/default.nix

@@ -0,0 +1,14 @@
+{ input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig
+, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, gconf
+, libgnomeprintui, libgnomecanvas
+}:
+
+stdenv.mkDerivation {
+  inherit (input) name src;
+  buildInputs = [
+    perl perlXMLParser pkgconfig gnomevfs
+    libbonobo gconf libgnomeprintui libgnomecanvas
+  ];
+  propagatedBuildInputs = [gtk libxml2 libgnomeprint];
+  PERL5LIB = perlXMLParser ~ "/lib/site_perl"; # !!!
+}

pkgs/development/libraries/gnome/libgnomeprint/default.nix

@@ -5,10 +5,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
       perl perlXMLParser pkgconfig popt libxml2
-      glib pango libart
+      glib pango
     ];
 
-  propagatedBuildInputs = [libxml2];  
+  propagatedBuildInputs = [libxml2 libart];
 
   PERL5LIB = perlXMLParser ~ "/lib/site_perl";
 }

pkgs/development/libraries/gnome/src-gnome-desktop-2.8.3.nix

@@ -31,4 +31,12 @@
       md5 = "c77789241d725e189ffc0391eda94361";
     };
   };
+
+  gtksourceview = {
+    name = "gtksourceview-1.1.1";
+    src = fetchurl {
+      url = ftp://ftp.gnome.org/Public/gnome/desktop/2.8/2.8.3/sources/gtksourceview-1.1.1.tar.bz2;
+      md5 = "2e59c8748594181d4bf452320c8c3b5c";
+    };
+  };
 }

pkgs/development/libraries/gtksourceview-sharp/builder.sh

@@ -0,0 +1,11 @@
+. $stdenv/setup
+
+genericBuild
+
+# !!! hack
+export ALL_INPUTS="$out $pkgs"
+
+find $out -name "*.dll.config" | while read configFile; do
+    echo "modifying config file $configFile"
+    $monoDLLFixer "$configFile"
+done

pkgs/development/libraries/gtksourceview-sharp/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtksourceview, monoDLLFixer}:
+
+stdenv.mkDerivation {
+  name = "gtksourceview-sharp-0.5";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.go-mono.com/archive/1.0/gtksourceview-sharp-0.5.tar.gz;
+    md5 = "b82e767e42a542e185a534048db3078d";
+  };
+
+  patches = [ ./prefix.patch ];
+
+  buildInputs = [
+    pkgconfig mono gtksharp gtksourceview
+  ];
+
+  inherit monoDLLFixer;
+}

pkgs/system/all-packages-generic.nix

@@ -643,6 +643,11 @@ rec {
               libgnomeprintui gconf;
   };
 
+  gtksourceviewsharp = import ../development/libraries/gtksourceview-sharp {
+    inherit fetchurl stdenv mono pkgconfig gtksharp monoDLLFixer;
+    inherit (gnome) gtksourceview;
+  };
+
   audiofile = (import ../development/libraries/audiofile) {
     inherit fetchurl stdenv;
   };
@@ -1122,7 +1127,8 @@ rec {
   };
 
   monodevelop = (import ../applications/editors/monodevelop) {
-    inherit fetchurl stdenv mono gtksharp perl perlXMLParser pkgconfig;
+    inherit fetchurl stdenv mono gtksharp gtksourceviewsharp
+              perl perlXMLParser pkgconfig;
     inherit (gnome) gnomevfs libbonobo gconf glib;
   };