From e5b4371bd200aad001c7f1ad2c17edc1bbb6ddba Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 29 May 2023 14:51:52 +0300 Subject: [PATCH 1/2] wxGTK31: drop mesa on darwin --- pkgs/development/libraries/wxwidgets/wxGTK31.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 7295c65d68b9..c05fcef2557a 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -1,8 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl -, gnome2 , gst_all_1 , gtk3 , libGL @@ -17,7 +15,7 @@ , compat30 ? true , unicode ? true , withEGL ? true -, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? !stdenv.isDarwin , withWebKit ? stdenv.isDarwin , webkitgtk , setfile @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = '' substituteInPlace configure --replace \ From 48a6774e27122dab8a7c10d518bd810b8b702994 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 29 May 2023 14:52:18 +0300 Subject: [PATCH 2/2] wxGTK32: drop mesa on darwin --- pkgs/development/libraries/wxwidgets/wxGTK32.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 8dbc6f87061d..45de5b603b67 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -2,9 +2,6 @@ , stdenv , expat , fetchFromGitHub -, fetchpatch -, fetchurl -, gnome2 , gst_all_1 , gtk3 , libGL @@ -23,7 +20,7 @@ , compat28 ? false , compat30 ? true , unicode ? true -, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withMesa ? !stdenv.isDarwin , withWebKit ? stdenv.isDarwin , webkitgtk , setfile @@ -115,7 +112,7 @@ stdenv.mkDerivation rec { "--enable-webviewwebkit" ]; - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib"; + SEARCH_LIB = lib.optionalString (!stdenv.isDarwin) "${libGLU.out}/lib ${libGL.out}/lib"; preConfigure = '' cp -r ${catch}/* 3rdparty/catch/