Merge pull request #198064 from wegank/wxgtk31-drop-gtk2

1 files changed, 7 insertions, 20 deletions

diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index d84c8a5aa5e48..af673695ace50 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -4,7 +4,6 @@
 , fetchurl
 , gnome2
 , gst_all_1
-, gtk2
 , gtk3
 , libGL
 , libGLU
@@ -18,7 +17,6 @@
 , compat30 ? true
 , unicode ? true
 , withEGL ? true
-, withGtk2 ? (!stdenv.isDarwin)
 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withWebKit ? stdenv.isDarwin
 , webkitgtk
@@ -33,11 +31,6 @@
 , WebKit
 }:
 
-assert withGtk2 -> (!withWebKit);
-
-let
-  gtk = if withGtk2 then gtk2 else gtk3;
-in
 stdenv.mkDerivation rec {
   pname = "wxwidgets";
   version = "3.1.5";
@@ -60,18 +53,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
-  ]
-  ++ lib.optionals (!stdenv.isDarwin) [
-    gtk
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    gtk3
     libSM
     libXinerama
     libXtst
     libXxf86vm
     xorgproto
   ]
-  ++ lib.optionals withGtk2 [
-    gnome2.GConf
-  ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
   ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
@@ -102,8 +91,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.isDarwin [
     "--with-osx_cocoa"
     "--with-libiconv"
-  ]
-  ++ lib.optionals withWebKit [
+  ] ++ lib.optionals withWebKit [
     "--enable-webview"
     "--enable-webviewwebkit"
   ];
@@ -133,6 +121,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru = {
+    inherit compat28 compat30 unicode;
+  };
+
   meta = with lib; {
     homepage = "https://www.wxwidgets.org/";
     description = "A Cross-Platform C++ GUI Library";
@@ -150,9 +142,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ tfmoraes ];
     platforms = platforms.unix;
   };
-
-  passthru = {
-    inherit gtk;
-    inherit compat28 compat30 unicode;
-  };
 }