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

* wxPython updated to 2.8.12.0.

Browse Source 
* wxPython builder: wrap the Python programs (such as pyshell) so that
  they actually work.

svn path=/nixpkgs/trunk/; revision=27122
This commit is contained in:
Eelco Dolstra 2011-05-03 16:57:18 +00:00
parent 5c244c345d
commit a7d4f19ab3
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/python-modules/wxPython/2.8.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.8.4.0";
name = "wxPython-2.8.12.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/wxpython/wxPython-src-2.8.4.0.tar.bz2;
sha256 = "0lkj29jcw3kqaf2iphgmmn9cqf2ppkm6qqr9izlx4bvn9dihgq6h";
url = mirror://sourceforge/wxpython/wxPython-src-2.8.12.0.tar.bz2;
sha256 = "1gdsk1p8ds4jd00habxy4y8m56247a5s1mvq1lm1r6475dvq4pkd";
};
buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
passthru = {inherit wxGTK;};
buildInputs = [ pkgconfig wxGTK (wxGTK.gtk) pythonPackages.python pythonPackages.wrapPython ];
passthru = { inherit wxGTK; };
}

5
pkgs/development/python-modules/wxPython/builder.sh
View File

@ -12,6 +12,11 @@ buildPhase() {
installPhase() {
python setup.py $flags install --prefix=$out
# Ugly workaround for Nixpkgs/111.
ln -s $out/lib/python*/site-packages/wx-*-gtk2-unicode/* $out/lib/python*/site-packages
wrapPythonPrograms
}
genericBuild

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

@ -435,7 +435,6 @@ let
};
bittorrent = callPackage ../tools/networking/p2p/bittorrent {
wxPython = wxPython26;
gui = true;
};
@ -4525,7 +4524,7 @@ let
setuptools = pythonPackages.setuptools;
wxPython = wxPython26;
wxPython = wxPython28;
wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
wxGTK = wxGTK26;