From fe05b6739ca768d30008cd6df5b8a23fecea5aed Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 24 Jul 2025 20:48:02 +0800 Subject: [PATCH] gthumb: Disable webservices and libchamplain webservices completely removed on upstream in next release: https://gitlab.gnome.org/GNOME/gthumb/-/commit/6738d43fe1b48745fde80a9ca5c80f8e0f12f7e9 --- pkgs/by-name/gt/gthumb/package.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix index 5ecf555b233c..946782f8e0ff 100644 --- a/pkgs/by-name/gt/gthumb/package.nix +++ b/pkgs/by-name/gt/gthumb/package.nix @@ -13,17 +13,13 @@ libtiff, gst_all_1, libraw, - libsoup_2_4, - libsecret, glib, gtk3, gsettings-desktop-schemas, - libchamplain, libjxl, librsvg, libwebp, libX11, - json-glib, lcms2, bison, flex, @@ -33,8 +29,6 @@ python3, desktop-file-utils, itstool, - withWebservices ? true, - webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -70,26 +64,23 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gtk3 - json-glib lcms2 - libchamplain libheif libjpeg libjxl libraw librsvg - libsecret - libsoup_2_4 libtiff libwebp libX11 - ] - ++ lib.optional withWebservices webkitgtk_4_0; + ]; mesonFlags = [ - "-Dlibchamplain=true" "-Dlibjxl=true" - (lib.mesonBool "webservices" withWebservices) + # Depends on libsoup2. + # https://gitlab.gnome.org/GNOME/gthumb/-/issues/244 + "-Dlibchamplain=false" + "-Dwebservices=false" ]; postPatch = '' @@ -119,6 +110,9 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "gthumb"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.mimame ]; + maintainers = with maintainers; [ + bobby285271 + mimame + ]; }; })