C++ bindings of the GTK+ 2.14 libraries.

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

4 files changed, 66 insertions, 23 deletions

diff --git a/pkgs/development/libraries/gtk-libs/2.14/default.nix b/pkgs/development/libraries/gtk-libs/2.14/default.nix
index 72e7b0bbf6bc..a5ac93d068d1 100644
--- a/pkgs/development/libraries/gtk-libs/2.14/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.14/default.nix
@@ -1,25 +1,21 @@
 args: with args;
 
-# FIXME: Someone please upgrade the remaining libraries in `legacy'.
-let legacy = {
-     inherit ((import ../2.12) args) glibmm gtkmm;
-    };
-in
+rec {
 
-  rec {
+  glib = (import ./glib) args;
 
-    glib = (import ./glib) args;
+  atk = (import ./atk) (args // { inherit glib; });
 
-    atk = (import ./atk) (args // { inherit glib; });
+  pango = (import ./pango) (args // { inherit glib cairo; });
 
-    pango = (import ./pango) (args // { inherit glib; });
+  gtk = (import ./gtk+) (args // {
+    inherit glib atk pango;
+  });
 
-    gtk = (import ./gtk+) (args // {
-      inherit glib atk pango;
-    });
 
-  }
+  glibmm = (import ./glibmm) (args // { inherit glib; });
 
-  //
+  pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
 
-  legacy
+  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm pangomm; });
+}
diff --git a/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix b/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix
new file mode 100644
index 000000000000..790b006f90a5
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs/2.14/glibmm/default.nix
@@ -0,0 +1,21 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "glibmm-2.18.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/GNOME/sources/glibmm/2.18/${name}.tar.bz2";
+    sha256 = "0jg65hv6pwxqk4fabsjjz2zwn5hb6rgy3szj956avliarbliyr3r";
+  };
+
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [glib libsigcxx];
+
+  meta = {
+    description = "C++ interface to the GLib library";
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gtk-libs/2.14/gtkmm/default.nix b/pkgs/development/libraries/gtk-libs/2.14/gtkmm/default.nix
new file mode 100644
index 000000000000..2379dc04c120
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs/2.14/gtkmm/default.nix
@@ -0,0 +1,31 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "gtkmm-2.14.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkmm/2.14/${name}.tar.bz2";
+    sha256 = "18jral2lv9jv02d3balh0mi0wgbqhrz5y2laclri1skccc2q3c94";
+  };
+
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [ glibmm gtk atk cairomm pangomm ];
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/gtk-libs/2.14/pango/default.nix b/pkgs/development/libraries/gtk-libs/2.14/pango/default.nix
index 9c69cfc226bc..a309d414213e 100644
--- a/pkgs/development/libraries/gtk-libs/2.14/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.14/pango/default.nix
@@ -1,22 +1,17 @@
 args: with args;
 
 stdenv.mkDerivation rec {
-  name = "pango-1.20.5";
+  name = "pango-1.22.4";
   
   src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.20/${name}.tar.bz2";
-    sha256 = "1cpsm32prbxwq7hhfpc2f6a1hhz61nnllpy9sqr4r8hqmm5skxc6";
+    url = "mirror://gnome/sources/pango/1.22/${name}.tar.bz2";
+    sha256 = "0d55x97c78rmcsls5g236xwwhjq1bvscrlxqligyzsv0hgnxfizz";
   };
   
   buildInputs = [pkgconfig];
   
   propagatedBuildInputs = [x11 glib cairo libpng];
 
-  # The configure script doesn't seem to pick up the Cairo cflags.
-  preConfigure = ''
-    CAIRO_CFLAGS=$(pkg-config --cflags cairo --debug)
-  '';
-
   meta = {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";