From de86acc95510242100e16dac30fd1ba083c69c2b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Apr 2024 08:54:01 +0800 Subject: [PATCH] cinnamon.pix: Build without webkit2gtk-4.0 This removes webkit2gtk-4.0 from cinnamon closure. ref: https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version ref: https://salsa.debian.org/debian/gthumb/-/commit/a19d4c2b0a42073d7e4dc743f33d92af0a188836 --- pkgs/desktops/cinnamon/pix/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index d1272f431389..1264ca82fc8b 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -10,15 +10,12 @@ , libtiff , gst_all_1 , libraw -, libsoup , libsecret , glib , gtk3 , gsettings-desktop-schemas , librsvg , libwebp -, json-glib -, webkitgtk , lcms2 , bison , flex @@ -65,17 +62,14 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk3 - json-glib lcms2 libheif libjpeg libraw librsvg libsecret - libsoup libtiff libwebp - webkitgtk xapp ]; @@ -89,6 +83,10 @@ stdenv.mkDerivation rec { pix/make-authors-tab.py ''; + # Avoid direct dependency on webkit2gtk-4.0 + # https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version + mesonFlags = [ "-Dwebservices=false" ]; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") '';