diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-05-04 08:41:50 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-05-04 08:41:50 +0000 |
| commit | 345b9a75d566c47e2a307fab3fe0906f4d15893e (patch) | |
| tree | 2bbd406b1be88c992011acbc0c957860b98b68c0 /pkgs/development/python-modules/wxPython | |
| parent | 9afa230dfc5c275d62793a501d6e0c3982b95375 (diff) | |
| download | nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar.gz nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar.bz2 nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar.lz nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar.xz nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.tar.zst nixpkgs-345b9a75d566c47e2a307fab3fe0906f4d15893e.zip | |
* 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
Diffstat (limited to 'pkgs/development/python-modules/wxPython')
| -rw-r--r-- | pkgs/development/python-modules/wxPython/2.6.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/wxPython/2.6.nix b/pkgs/development/python-modules/wxPython/2.6.nix index ad8c39b4ea7..362f52bf44f 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; }; } |