JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Move wxPython into python-packages.nix so that you can get wxPython

Browse Source 
built for the appropriate Python version
  (e.g. python26Packages.wxPython).

svn path=/nixpkgs/trunk/; revision=27127
This commit is contained in:
Eelco Dolstra 2011-05-04 08:41:50 +00:00
parent 9afa230dfc
commit 345b9a75d5
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/wxPython/2.6.nix
View File

@ -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; };
}

14
pkgs/top-level/all-packages.nix
View File

@ -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;

21
pkgs/top-level/python-packages.nix
View File

@ -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