* Start adding wxPython 2.5. Doesn't work yet though, so disable it

  for now.

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

1 files changed, 6 insertions, 1 deletions

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index e6766978e2d..d45f65bf1d6 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;
   };