public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webkitgtk: clean up 

Remove gtk2 flag, which is no longer supported.
This commit is contained in:
Jan Tojnar 2020-10-24 01:42:06 +02:00
parent 625fb27d68
commit 8ccd765d37
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -41,8 +41,6 @@
, enableGeoLocation ? true , enableGeoLocation ? true
, geoclue2 , geoclue2
, sqlite , sqlite
, enableGtk2Plugins ? false
, gtk2 ? null
, enableGLES ? true , enableGLES ? true
, gst-plugins-base , gst-plugins-base
, gst-plugins-bad , gst-plugins-bad
@ -56,8 +54,6 @@
}: }:
assert enableGeoLocation -> geoclue2 != null; assert enableGeoLocation -> geoclue2 != null;
assert enableGtk2Plugins -> gtk2 != null;
assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib; with stdenv.lib;
@ -146,8 +142,7 @@ stdenv.mkDerivation rec {
systemd systemd
wayland wayland
xdg-dbus-proxy xdg-dbus-proxy
] ++ optional enableGeoLocation geoclue2 ] ++ optional enableGeoLocation geoclue2;
++ optional enableGtk2Plugins gtk2;
propagatedBuildInputs = [ propagatedBuildInputs = [
gtk3 gtk3
@ -171,8 +166,7 @@ stdenv.mkDerivation rec {
"-DENABLE_X11_TARGET=OFF" "-DENABLE_X11_TARGET=OFF"
"-DUSE_ACCELERATE=0" "-DUSE_ACCELERATE=0"
"-DUSE_SYSTEM_MALLOC=ON" "-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 = '' postPatch = ''
patchShebangs . patchShebangs .