* wxPython updated to 2.8.12.0.

* wxPython builder: wrap the Python programs (such as pyshell) so that
  they actually work.

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

pkgs/development/python-modules/wxPython/2.8.nix

@@ -1,14 +1,18 @@
-{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
 
 assert wxGTK.unicode;
 
 stdenv.mkDerivation {
-  name = "wxPython-2.8.4.0";
+  name = "wxPython-2.8.12.0";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
-    url = mirror://sourceforge/wxpython/wxPython-src-2.8.4.0.tar.bz2;
-    sha256 = "0lkj29jcw3kqaf2iphgmmn9cqf2ppkm6qqr9izlx4bvn9dihgq6h";
+    url = mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2;
+    sha256 = "1gdsk1p8ds4jd00habxy4y8m56247a5s1mvq1lm1r6475dvq4pkd";
   };
-  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
-  passthru = {inherit wxGTK;};
+  
+  buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
+  
+  passthru = { inherit wxGTK; };
 }

pkgs/development/python-modules/wxPython/builder.sh

@@ -12,6 +12,11 @@ buildPhase() {
 
 installPhase() {
     python setup.py $flags install --prefix=$out
+
+    # Ugly workaround for Nixpkgs/111.
+    ln -s $out/lib/python*/site-packages/wx-*-gtk2-unicode/* $out/lib/python*/site-packages
+    
+    wrapPythonPrograms    
 }
 
 genericBuild