diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 89796500e04ee..71f8b2847e3be 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -13,29 +13,59 @@ , wxGTK , pillow , numpy +, libXinerama +, libSM +, libXxf86vm +, libXtst +, libGLU +, libGL +, xorgproto +, gst_all_1 +, libglvnd +, mesa +, webkitgtk +, autoPatchelfHook }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in buildPythonPackage rec { pname = "wxPython"; - version = "4.1.0"; + version = "4.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f"; + sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80"; }; # https://github.com/NixOS/nixpkgs/issues/75759 # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; + nativeBuildInputs = [ + which + doxygen + wxGTK.gtk + pkg-config + autoPatchelfHook + ]; buildInputs = [ wxGTK.gtk ncurses + libXinerama + libSM + libXxf86vm + libXtst + xorgproto + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libGLU + libGL + libglvnd + mesa + webkitgtk ]; propagatedBuildInputs = [ pillow numpy ]; @@ -43,23 +73,17 @@ buildPythonPackage rec { DOXYGEN = "${doxygen}/bin/doxygen"; preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), ("appsvc", None) ]}' - - # https://github.com/wxWidgets/Phoenix/pull/1584 - # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699 - substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \ - "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()" ''; buildPhase = '' - ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py + ${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py ''; installPhase = '' @@ -67,8 +91,6 @@ buildPythonPackage rec { wrapPythonPrograms ''; - passthru = { inherit wxGTK; }; - meta = with lib; { description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/";