Author: eelco
Date: Tue May 3 16:57:18 2011
New Revision: 27122
URL: https://svn.nixos.org/websvn/nix/?rev=27122&sc=1
Log:
* wxPython updated to 2.8.12.0.
* wxPython builder: wrap the Python programs (such as pyshell) so that
they actually work.
Modified:
nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.8.nix
nixpkgs/trunk/pkgs/development/python-modules/wxPython/builder.sh
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.8.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.8.nix Tue May
3 16:29:57 2011 (r27121)
+++ nixpkgs/trunk/pkgs/development/python-modules/wxPython/2.8.nix Tue May
3 16:57:18 2011 (r27122)
@@ -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; };
}
Modified: nixpkgs/trunk/pkgs/development/python-modules/wxPython/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/development/python-modules/wxPython/builder.sh Tue May
3 16:29:57 2011 (r27121)
+++ nixpkgs/trunk/pkgs/development/python-modules/wxPython/builder.sh Tue May
3 16:57:18 2011 (r27122)
@@ -12,6 +12,11 @@
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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 3 16:29:57
2011 (r27121)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 3 16:57:18
2011 (r27122)
@@ -435,7 +435,6 @@
};
bittorrent = callPackage ../tools/networking/p2p/bittorrent {
- wxPython = wxPython26;
gui = true;
};
@@ -4525,7 +4524,7 @@
setuptools = pythonPackages.setuptools;
- wxPython = wxPython26;
+ wxPython = wxPython28;
wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {
wxGTK = wxGTK26;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
