wxPython: enable headers

Headers were disabled, probably because they caused a build error: the header files were being
copied to the store path of wxwidgets, but it failed with permission denied. With this commit,
the header files stay in the wxPython store path.
To point the builder of another derivation to the wxPython header files, some tweaking is
needed. E.g. for kicad: cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]
This commit is contained in:
Bert Moens 2017-12-13 21:01:06 +01:00
parent 19841b5ba3
commit 7eb0b20918

View File

@ -43,6 +43,9 @@ buildPythonPackage rec {
# remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch
substituteInPlace config.py \ substituteInPlace config.py \
--replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" --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 # this check is supposed to only return false on older systems running non-framework python
substituteInPlace src/osx_cocoa/_core_wrap.cpp \ substituteInPlace src/osx_cocoa/_core_wrap.cpp \
--replace "return wxPyTestDisplayAvailable();" "return true;" --replace "return wxPyTestDisplayAvailable();" "return true;"
@ -62,7 +65,7 @@ buildPythonPackage rec {
buildPhase = ""; buildPhase = "";
installPhase = '' 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 wrapPythonPrograms
''; '';