pythonPackages.wxPython{28,30} : use buildPythonPackage
This commit is contained in:
parent
63b7323402
commit
9597ca718b
|
@ -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";
|
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; };
|
||||||
|
}
|
||||||
|
|
|
@ -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";
|
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; };
|
||||||
|
}
|
||||||
|
|
|
@ -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; };
|
|
||||||
}
|
|
|
@ -23339,13 +23339,11 @@ in modules // {
|
||||||
|
|
||||||
wxPython = self.wxPython28;
|
wxPython = self.wxPython28;
|
||||||
|
|
||||||
wxPython28 = import ../development/python-modules/wxPython/2.8.nix {
|
wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix {
|
||||||
inherit callPackage;
|
|
||||||
wxGTK = pkgs.wxGTK28;
|
wxGTK = pkgs.wxGTK28;
|
||||||
};
|
};
|
||||||
|
|
||||||
wxPython30 = import ../development/python-modules/wxPython/3.0.nix {
|
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
|
||||||
inherit callPackage;
|
|
||||||
wxGTK = pkgs.wxGTK30;
|
wxGTK = pkgs.wxGTK30;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue