From a7d4f19ab36e18bb63dd446d27eedc7b6173eec3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 May 2011 16:57:18 +0000 Subject: * wxPython updated to 2.8.12.0. * wxPython builder: wrap the Python programs (such as pyshell) so that they actually work. svn path=/nixpkgs/trunk/; revision=27122 --- pkgs/development/python-modules/wxPython/2.8.nix | 16 ++++++++++------ pkgs/development/python-modules/wxPython/builder.sh | 5 +++++ 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'pkgs/development/python-modules/wxPython') diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index 5cab740f8c3b..d574909d4e2a 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -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; }; } diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh index ed7177081f9f..1ad71e3b9cdc 100644 --- a/pkgs/development/python-modules/wxPython/builder.sh +++ b/pkgs/development/python-modules/wxPython/builder.sh @@ -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 -- cgit 1.4.1