* Updated pygobject and pygtk.

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

2 files changed, 27 insertions, 16 deletions

diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index bb60ec66291c..303bb36a3a87 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,13 +1,16 @@
-{stdenv, fetchurl, python, pkgconfig, glib}:
+{ stdenv, fetchurl, python, pkgconfig, glib }:
 
-stdenv.mkDerivation {
-  name = "pygobject-2.20.0";
+stdenv.mkDerivation rec {
+  name = "pygobject-2.26.0";
+  
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2;
-    sha256 = "10gsf3i2q9y659hayxyaxyfz7inswcjc8m6iyqckwsj2yjij7sa1";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.26/${name}.tar.bz2";
+    sha256 = "5554acff9c27b647144143b0459359864e4a6f2ff62c7ba21cf310ad755cf7c7";
   };
 
-  buildInputs = [python pkgconfig glib];
+  configureFlags = "--disable-introspection";
+
+  buildInputs = [ python pkgconfig glib ];
 
   postInstall = ''
     # All python code is installed into a "gtk-2.0" sub-directory. That
@@ -20,4 +23,9 @@ stdenv.mkDerivation {
       ln -s "gtk-2.0/$n" "../$n"
     done
   '';
+
+  meta = {
+    homepage = http://live.gnome.org/PyGObject;
+    description = "Python bindings for Glib";
+  };
 }
diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index 48c8ebfa87a4..81147fff17dc 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, python, pkgconfig, glib, gtk, pygobject, pycairo
-  , libglade ? null}:
+{ stdenv, fetchurl, makeWrapper, python, pkgconfig, glib, gtk, pygobject, pycairo
+, libglade ? null }:
 
-stdenv.mkDerivation {
-  name = "pygtk-2.17.0";
+stdenv.mkDerivation rec {
+  name = "pygtk-2.22.0";
 
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.17/pygtk-2.17.0.tar.bz2;
-    sha256 = "000l3wrcj0ghid045n6ipqg4q4zci51z9k9fqw4n4p3n5rx82qba";
+    url = "http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.22/${name}.tar.bz2";
+    sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
   };
 
-  buildInputs = [python pkgconfig glib gtk]
-    ++ (if libglade != null then [libglade] else [])
-  ;
+  buildInputs =
+    [ makeWrapper python pkgconfig glib gtk ]
+    ++ stdenv.lib.optional (libglade != null) libglade;
 
-  propagatedBuildInputs = [pygobject pycairo];
+  propagatedBuildInputs = [ pygobject pycairo ];
 
   postInstall = ''
     rm $out/bin/pygtk-codegen-2.0
@@ -28,5 +28,8 @@ stdenv.mkDerivation {
     for n in *; do
       ln -s "gtk-2.0/$n" "../$n"
     done
+
+    wrapProgram $out/bin/pygtk-demo --prefix PYTHONPATH ":" \
+        $(toPythonPath "${pygobject} ${pycairo} $out")
   '';
 }