From 8ccd765d3775f80566bf19e48a21f527f0aa7e29 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Oct 2020 01:42:06 +0200 Subject: [PATCH] webkitgtk: clean up Remove gtk2 flag, which is no longer supported. --- pkgs/development/libraries/webkitgtk/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index de3d8da0bc3..814a1f22592 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -41,8 +41,6 @@ , enableGeoLocation ? true , geoclue2 , sqlite -, enableGtk2Plugins ? false -, gtk2 ? null , enableGLES ? true , gst-plugins-base , gst-plugins-bad @@ -56,8 +54,6 @@ }: assert enableGeoLocation -> geoclue2 != null; -assert enableGtk2Plugins -> gtk2 != null; -assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; @@ -146,8 +142,7 @@ stdenv.mkDerivation rec { systemd wayland xdg-dbus-proxy - ] ++ optional enableGeoLocation geoclue2 - ++ optional enableGtk2Plugins gtk2; + ] ++ optional enableGeoLocation geoclue2; propagatedBuildInputs = [ gtk3 @@ -171,8 +166,7 @@ stdenv.mkDerivation rec { "-DENABLE_X11_TARGET=OFF" "-DUSE_ACCELERATE=0" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; postPatch = '' patchShebangs .