From 5fb1244dcf7cbbac02fbf6b0bd8b2365f53622ed Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:33:47 +0200 Subject: [PATCH] python3Packages.wxPython_4_0: fix build on aarch64-darwin --- pkgs/development/python-modules/wxPython/4.0.nix | 9 +++++---- pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 9b4dcd5e6b48..a910358f4382 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -12,7 +12,6 @@ , ncurses , libintl , wxGTK -, wxmac , IOKit , Carbon , Cocoa @@ -35,8 +34,7 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkg-config which doxygen setuptools ] - ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); + nativeBuildInputs = [ pkg-config which doxygen setuptools wxGTK ]; buildInputs = [ ncurses libintl ] ++ (if stdenv.isDarwin @@ -59,6 +57,9 @@ buildPythonPackage rec { ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), ("appsvc", None) ]}' + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + # Remove the OSX-Only wx.webkit module + sed -i "s/makeETGRule(.*'WXWEBKIT')/pass/" wscript ''; buildPhase = '' @@ -69,7 +70,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py install --skip-build --prefix=$out ''; - passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; }; + passthru = { wxWidgets = wxGTK; }; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 077d3fda6796..3bfe6e7cb5f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11999,8 +11999,7 @@ in { wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; - wxGTK = pkgs.wxGTK30.override { - withGtk2 = false; + wxGTK = pkgs.wxGTK30-gtk3.override { withWebKit = true; }; };