From 345b9a75d566c47e2a307fab3fe0906f4d15893e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2011 08:41:50 +0000
Subject: [PATCH] * Move wxPython into python-packages.nix so that you can get
 wxPython   built for the appropriate Python version   (e.g.
 python26Packages.wxPython).

svn path=/nixpkgs/trunk/; revision=27127
---
 .../python-modules/wxPython/2.6.nix           | 10 ++++++---
 pkgs/top-level/all-packages.nix               | 14 ++++++-------
 pkgs/top-level/python-packages.nix            | 21 +++++++++++++++++--
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix
index ad8c39b4ea7a..362f52bf44fc 100644
--- a/pkgs/development/python-modules/wxPython/2.6.nix
+++ b/pkgs/development/python-modules/wxPython/2.6.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, pkgconfig, wxGTK, python}:
+{ stdenv, fetchurl, pkgconfig, wxGTK, pythonPackages }:
 
 assert wxGTK.unicode;
 
 stdenv.mkDerivation {
   name = "wxPython-2.6.3.3";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = mirror://sourceforge/wxpython/wxPython-src-2.6.3.3.tar.bz2;
     md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
   };
-  buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
-  inherit wxGTK; # !!! move this down
+  
+  buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
+  
+  passthru = { inherit wxGTK; };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25cd6f774d1e..25fd8bb0f589 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4524,13 +4524,9 @@ let
 
   setuptools = pythonPackages.setuptools;
 
-  wxPython = wxPython28;
-
-  wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
-    wxGTK = wxGTK26;
-  };
-
-  wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { };
+  wxPython = pythonPackages.wxPython;
+  wxPython26 = pythonPackages.wxPython26;
+  wxPython28 = pythonPackages.wxPython28;
 
   twisted = pythonPackages.twisted;
 
@@ -6909,7 +6905,9 @@ let
 
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
-  tribler = callPackage ../applications/networking/p2p/tribler { };
+  tribler = callPackage ../applications/networking/p2p/tribler {
+    wxPython = wxPython26;
+  };
 
   twinkle = callPackage ../applications/networking/twinkle {
     qt = qt3;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ab743a4e5cd..c2aea2e3176a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1,6 +1,6 @@
 { pkgs, python }:
 
-python.modules // rec {
+let pythonPackages = python.modules // rec {
 
   inherit python;
 
@@ -1729,6 +1729,23 @@ python.modules // rec {
     };
   };
 
+
+  wxPython = wxPython28;
+  
+
+  wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig;
+    inherit pythonPackages;
+    wxGTK = pkgs.wxGTK26;
+  };
+
+  
+  wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig;
+    inherit pythonPackages;
+    wxGTK = pkgs.wxGTK28;
+  };
+
   
   zbase32 = buildPythonPackage (rec {
     name = "zbase32-1.1.2";
@@ -1797,4 +1814,4 @@ python.modules // rec {
     };
   };
 
-}
+}; in pythonPackages