diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-17 00:17:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 00:17:38 +0000 |
| commit | 6ba5caacbd101c640b19d1c2aca874ad365c2bc9 (patch) | |
| tree | d837b76f1845bf16479fcf3a06cc439770861900 /pkgs/development/python-modules | |
| parent | 98928b81afbc77a28b63c3bae30b583b559b59c7 (diff) | |
| parent | 7eb0b20918c8e15dfb7177250df1244a997ae4a2 (diff) | |
| download | nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar.gz nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar.bz2 nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar.lz nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar.xz nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.tar.zst nixlib-6ba5caacbd101c640b19d1c2aca874ad365c2bc9.zip | |
Merge pull request #32647 from berce/upstream-wxPython
wxPython: enable headers
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/wxPython/3.0.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index ab7b44019c54..abce4cf44e0c 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch substituteInPlace config.py \ --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" + # set the WXPREFIX to $out instead of the storepath of wxwidgets + substituteInPlace config.py \ + --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'" # this check is supposed to only return false on older systems running non-framework python substituteInPlace src/osx_cocoa/_core_wrap.cpp \ --replace "return wxPyTestDisplayAvailable();" "return true;" @@ -62,7 +65,7 @@ buildPythonPackage rec { buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; |