From 9597ca718b1612f0a1f0ec0c00b02b55f7a3775e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 May 2016 21:25:48 +0200 Subject: [PATCH] pythonPackages.wxPython{28,30} : use buildPythonPackage --- .../python-modules/wxPython/2.8.nix | 41 +++++++++++++++++-- .../python-modules/wxPython/3.0.nix | 38 +++++++++++++++-- .../python-modules/wxPython/generic.nix | 31 -------------- pkgs/top-level/python-packages.nix | 6 +-- 4 files changed, 73 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/wxPython/generic.nix diff --git a/pkgs/development/python-modules/wxPython/2.8.nix b/pkgs/development/python-modules/wxPython/2.8.nix index f0a45242415..12027f54ff8 100644 --- a/pkgs/development/python-modules/wxPython/2.8.nix +++ b/pkgs/development/python-modules/wxPython/2.8.nix @@ -1,6 +1,39 @@ -{ callPackage, ... } @ args: +{ fetchurl +, lib +, pythonPackages +, openglSupport ? true +, libX11 +, wxGTK +, pkgconfig +}: -callPackage ./generic.nix (args // rec { +assert wxGTK.unicode; + +with pythonPackages; + +buildPythonPackage rec { + name = "wxPython-${version}"; version = "2.8.12.1"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; -}) + + disabled = isPy3k || isPyPy; + doCheck = false; + + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; + }; + + propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; + preConfigure = "cd wxPython"; + + NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + + buildPhase = ""; + + installPhase = '' + ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; +} diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 6892d7e8729..7c225a95f2a 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -1,9 +1,39 @@ -{ callPackage, ... } @ args: +{ fetchurl +, lib +, pythonPackages +, openglSupport ? true +, libX11 +, wxGTK +, pkgconfig +}: -callPackage ./generic.nix (args // rec { +assert wxGTK.unicode; +with pythonPackages; + +buildPythonPackage rec { + name = "wxPython-${version}"; version = "3.0.2.0"; - sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; + disabled = isPy3k || isPyPy; + doCheck = false; -}) + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; + }; + + propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; + preConfigure = "cd wxPython"; + + NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + + buildPhase = ""; + + installPhase = '' + ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + wrapPythonPrograms + ''; + + passthru = { inherit wxGTK openglSupport; }; +} diff --git a/pkgs/development/python-modules/wxPython/generic.nix b/pkgs/development/python-modules/wxPython/generic.nix deleted file mode 100644 index 16c7c126318..00000000000 --- a/pkgs/development/python-modules/wxPython/generic.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl -, version, sha256, wrapPython, setuptools, libX11, ... -}: - -assert wxGTK.unicode; - -stdenv.mkDerivation rec { - name = "wxPython-${version}"; - inherit version; - - disabled = isPy3k || isPyPy; - doCheck = false; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - inherit sha256; - }; - - pythonPath = [ python setuptools ]; - buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython libX11 ] ++ stdenv.lib.optional openglSupport pyopengl; - preConfigure = "cd wxPython"; - - NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; - - installPhase = '' - ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out - wrapPythonPrograms - ''; - - passthru = { inherit wxGTK openglSupport; }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2406df879b8..ac5f14ce7a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23339,13 +23339,11 @@ in modules // { wxPython = self.wxPython28; - wxPython28 = import ../development/python-modules/wxPython/2.8.nix { - inherit callPackage; + wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix { wxGTK = pkgs.wxGTK28; }; - wxPython30 = import ../development/python-modules/wxPython/3.0.nix { - inherit callPackage; + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxGTK = pkgs.wxGTK30; };