From 854a00b962b7860711caea124d69f3c24fb112c8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 15 Feb 2022 22:03:31 -0800 Subject: [PATCH] yelp: Use webkit2gtk-4.0 ABI yelp was our only package using the webkit2gtk-4.1 ABI, which inflated the NixOS GNOME ISO with an extra flavor of webkit2gtk. Fixes part of #159612. Signed-off-by: Anders Kaseorg --- pkgs/desktops/gnome/core/yelp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 4b3ee62dcee4..be858a19487d 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,7 +2,7 @@ , stdenv , gettext , fetchurl -, webkitgtk_4_1 +, webkitgtk , pkg-config , gtk3 , glib @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib - webkitgtk_4_1 + webkitgtk sqlite libxml2 libxslt @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; + # To reduce the GNOME ISO closure size. Remove when other packages + # are using webkit2gtk_4_1. + configureFlags = ["--with-webkit2gtk-4-0"]; + passthru = { updateScript = gnome.updateScript { packageName = "yelp";