diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:42:06 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-24 01:42:16 +0200 |
| commit | 8ccd765d3775f80566bf19e48a21f527f0aa7e29 (patch) | |
| tree | a9f2c7a22861e78927e56e8e185f8120b666dc68 /pkgs/development/libraries/webkitgtk | |
| parent | 625fb27d68c103a6007b4b762ae814c08f9fc217 (diff) | |
| download | nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar.gz nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar.bz2 nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar.lz nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar.xz nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.tar.zst nixpkgs-8ccd765d3775f80566bf19e48a21f527f0aa7e29.zip | |
webkitgtk: clean up
Remove gtk2 flag, which is no longer supported.
Diffstat (limited to 'pkgs/development/libraries/webkitgtk')
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 10 |
1 files 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 . |