Merge pull request #234782 from wegank/wx-mesa

wxGTK31, wxGTK32: drop mesa on darwin

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 \

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/