python3Packages.wxPython_4_0: fix build on aarch64-darwin
This commit is contained in:
@@ -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 = {
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user