Added libraries:

  - gtkmm: C++ bindings for gtk
  - glibmm: C++ bindings for glib
  - libsigc++ (C++)

Added applications:
  - Batik: SVG rasterizer (and more)
  - Inkscape: vector graphics drawing application

Upgraded:
  - boehm-gc


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

9 files changed, 117 insertions, 3 deletions

diff --git a/pkgs/applications/graphics/batik/builder.sh b/pkgs/applications/graphics/batik/builder.sh
new file mode 100755
index 00000000000..06af1559b02
--- /dev/null
+++ b/pkgs/applications/graphics/batik/builder.sh
@@ -0,0 +1,7 @@
+set -e
+
+. $stdenv/setup
+
+unzip $src
+mkdir $out
+mv batik-* $out/batik
diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix
new file mode 100644
index 00000000000..8d422b6f880
--- /dev/null
+++ b/pkgs/applications/graphics/batik/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "batik-1.6";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://apache.cs.uu.nl/dist/xml/batik/batik-1.6.zip;
+    md5 = "edff288fc64f968ff96ca49763d50f3c";
+  };
+
+  buildInputs = [unzip];
+}
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
new file mode 100644
index 00000000000..d425727ef19
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig,
+  perl, perlXMLParser,
+  gtk, libXft, fontconfig,
+  libpng,
+  zlib, popt,
+  boehmgc,
+  libxml2, libxslt,
+  glib,
+  gtkmm, glibmm, libsigcxx
+}:
+
+stdenv.mkDerivation {
+  name = "inkscape-0.42.2";
+
+  src = fetchurl {
+    url = http://easynews.dl.sourceforge.net/sourceforge/inkscape/inkscape-0.42.2.tar.bz2;
+    md5 = "a27172087018e850e92e97e52b5dad08";
+  };
+
+  buildInputs = [
+    pkgconfig
+    perl perlXMLParser
+    gtk libXft fontconfig
+    libpng
+    zlib popt
+    boehmgc
+    libxml2 libxslt
+    glib
+    gtkmm glibmm libsigcxx
+  ];
+}
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 83b400af57b..d3e12096457 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "boehm-gc-6.3";
+  name = "boehm-gc-6.5";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gc6.3.tar.gz;
-    md5 = "8b37ee18cbeb1dfd1866958e280db871";
+    url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz;
+    md5 = "00bf95cdcbedfa7321d14e0133b31cdb";
   };
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix b/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
new file mode 100644
index 00000000000..957c596fc7b
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.6/glibmm/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, glib, libsigcxx}:
+
+stdenv.mkDerivation {
+  name = "glibmm-2.6.4";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-2.6.1.tar.bz2;
+    md5 = "e37da352bf581503c5866f0231fd4a74";
+  };
+
+  buildInputs = [pkgconfig glib libsigcxx];
+}
+
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
new file mode 100644
index 00000000000..ebc1e881c47
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtkmm/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, libsigcxx}:
+
+stdenv.mkDerivation {
+  name = "gtkmm-2.6.4";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.6/gtkmm-2.6.4.tar.bz2;
+    md5 = "f71d1c4a89c4f9e054400f12a82dec5f";
+  };
+
+  buildInputs = [pkgconfig gtk atk glibmm libsigcxx];
+}
+
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
new file mode 100644
index 00000000000..ba24763ea18
--- /dev/null
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "libsigc++-2.0.16";
+  src = fetchurl {
+    url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.0/libsigc++-2.0.16.tar.gz;
+    md5 = "49b8c091b1be84d9f9801c4c81cd98b8";
+  };
+
+  buildInputs = [pkgconfig];
+}
+
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 3c8ba63a16f..ebddd7c18f5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -813,6 +813,21 @@ rec {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
   };
 
+  gtkmm = import ../development/libraries/gtk-libs-2.6/gtkmm {
+    inherit fetchurl stdenv pkgconfig libsigcxx;
+    inherit (gtkLibs26) gtk atk;
+    inherit glibmm;
+  };
+
+  glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {
+    inherit fetchurl stdenv pkgconfig libsigcxx;
+    inherit (gtkLibs26) glib;
+  };
+
+  libsigcxx = import ../development/libraries/libsigcxx {
+    inherit fetchurl stdenv pkgconfig;
+  };
+
   pangoxsl = (import ../development/libraries/pangoxsl) {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) glib pango;
@@ -1427,6 +1442,18 @@ rec {
     inherit (gtkLibs) gtk;
   };
 
+  batik = (import ../applications/graphics/batik) {
+    inherit fetchurl stdenv unzip;
+  };
+
+  inkscape = (import ../applications/graphics/inkscape) {
+    inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt libxml2 libxslt libpng boehmgc;
+    inherit (gtkLibs) gtk;
+    inherit gtkmm glibmm libsigcxx;
+    inherit (xlibs) libXft fontconfig;
+    inherit (gnome) glib;
+  };
+
   fspot = (import ../applications/graphics/f-spot) {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig mono
             libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 88d20f40299..eb8f674abff 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -74,6 +74,7 @@ let {
     xineUI
     zapping
     gqview
+    inkscape
 #    fspot
     hello
     xchm