diff --git a/pkgs/development/python-modules/wxPython-2.5/builder.sh b/pkgs/development/python-modules/wxPython-2.5/builder.sh
new file mode 100644
index 000000000000..6bb06d117515
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython-2.5/builder.sh
@@ -0,0 +1,24 @@
+. $stdenv/setup
+
+flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
+
+configurePhase() {
+    cd wxPython
+}
+configurePhase=configurePhase
+
+buildPhase() {
+    # Hack: setup.py should figure this out itself (by calling
+    # wx-config) but apparently something goes wrong.
+    export NIX_CFLAGS_COMPILE="`wx-config --cflags` $NIX_CFLAGS_COMPILE"
+        
+    python setup.py $flags build_ext
+}
+buildPhase=buildPhase
+
+installPhase() {
+    python setup.py $flags install --prefix=$out
+}
+installPhase=installPhase
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/development/python-modules/wxPython-2.5/default.nix b/pkgs/development/python-modules/wxPython-2.5/default.nix
new file mode 100644
index 000000000000..acc67e2a0530
--- /dev/null
+++ b/pkgs/development/python-modules/wxPython-2.5/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+
+assert wxGTK.compat22;
+
+stdenv.mkDerivation {
+  name = "wxPython-2.5.2.8";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.5.2.8.tar.gz;
+    md5 = "573fd376fd39b66ad5fbf44b487aa0b2";
+  };
+  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
+  inherit wxGTK; # !!! move this down
+} // { inherit python; } 
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index e6766978e2d7..d45f65bf1d6a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -640,10 +640,15 @@ rec {
     inherit fetchurl stdenv perl expat;
   };
 
-  wxPython = (import ../development/python-modules/wxPython) {
+  wxPython = (import ../development/python-modules/wxPython-2.5) {
     inherit fetchurl stdenv pkgconfig wxGTK python;
   };
 
+  wxPython24 = (import ../development/python-modules/wxPython) {
+    inherit fetchurl stdenv pkgconfig python;
+    wxGTK = wxGTK24;
+  };
+
   readline = (import ../development/libraries/readline) {
     inherit fetchurl stdenv ncurses;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 7117263ba910..e3fe00fa48a9 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -17,7 +17,7 @@ let {
     wget
     par2cmdline
     cksfv
-    bittorrent
+#    bittorrent
     graphviz
     bash
     binutils