From 128b8d9181032c63d77a5e0c7d8e006001913361 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 5 Dec 2019 05:18:10 -0500 Subject: [PATCH] wxGTK{30,31}: don't use webkitgtk24x You know cannot enable optional withWebKit when withGtk2 is enabled. --- pkgs/development/libraries/wxwidgets/3.0/default.nix | 9 +++++---- pkgs/development/libraries/wxwidgets/3.1/default.nix | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index a12447562b8..3bbfb139279 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -6,15 +6,16 @@ , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null +, withWebKit ? false, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: +with stdenv.lib; assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; +assert withWebKit -> webkitgtk != null; -with stdenv.lib; +assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { version = "3.0.4"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) + ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 8fe75153de6..0984472e860 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -5,15 +5,16 @@ , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null +, withWebKit ? false, webkitgtk ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: +with stdenv.lib; assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; +assert withWebKit -> webkitgtk != null; -with stdenv.lib; +assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { version = "3.1.2"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) + ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ];