* Updated some more packages. However, bittorrent and vlc don't work

right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

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

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

@@ -1,6 +1,20 @@
-buildinputs="$wxGTK $python $pkgconfig $gtk"
 . $stdenv/setup
 
-tar xvfz $src
-cd wxPythonSrc-*/wxPython
-python setup.py WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0 build install --prefix=$out
+flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
+
+configurePhase() {
+    cd wxPython
+}
+configurePhase=configurePhase
+
+buildPhase() {
+    python setup.py $flags build
+}
+buildPhase=buildPhase
+
+installPhase() {
+    python setup.py $flags install --prefix=$out
+}
+installPhase=installPhase
+
+genericBuild

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

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, python}:
+{stdenv, fetchurl, pkgconfig, wxGTK, python}:
 
 assert wxGTK.compat22;
 
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
     url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz;
     md5 = "ea4eb68e10a0c2a9be643b35dcb78e41";
   };
-  pkgconfig = wxGTK.pkgconfig;
-  gtk = wxGTK.gtk;
-  inherit wxGTK python;
-}
+  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
+  inherit wxGTK; # !!! move this down
+} // { inherit python; }