Merge pull request #196351 from jtojnar/gnome-cleanups

GNOME cleanups

pkgs/desktops/gnome/core/gnome-software/default.nix

@@ -12,7 +12,7 @@
 , ostree
 , glib
 , appstream
-, libsoup
+, libsoup_3
 , libadwaita
 , polkit
 , isocodes
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     glib
     packagekit
     appstream
-    libsoup
+    libsoup_3
     libadwaita
     gsettings-desktop-schemas
     gnome-desktop
@@ -102,8 +102,6 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    # Needs flatpak to upgrade
-    "-Dsoup2=true"
     # Requires /etc/machine-id, D-Bus system bus, etc.
     "-Dtests=false"
   ] ++ lib.optionals (!withFwupd) [

pkgs/desktops/gnome/core/sushi/default.nix

@@ -8,7 +8,7 @@
 , gnome
 , gtksourceview4
 , gjs
-, libsoup
+, libsoup_3
 , webkitgtk_4_1
 , icu
 , wrapGAppsHook
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     gtksourceview4
     gdk-pixbuf
     librsvg
-    libsoup
+    libsoup_3
     webkitgtk_4_1
     libepoxy
     gst_all_1.gstreamer

pkgs/desktops/gnome/misc/gitg/default.nix

@@ -12,7 +12,6 @@
 , libpeas
 , bash
 , gobject-introspection
-, libsoup
 , gtksourceview4
 , gsettings-desktop-schemas
 , adwaita-icon-theme
@@ -22,6 +21,7 @@
 , libgee
 , libgit2-glib
 , libsecret
+, libxml2
 , meson
 , ninja
 , python3
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     libgit2-glib
     libpeas
     libsecret
-    libsoup
+    libxml2
   ];
 
   doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed

pkgs/desktops/gnome/misc/gnome-tweaks/default.nix

@@ -13,7 +13,6 @@
 , itstool
 , libhandy
 , libnotify
-, libsoup
 , libxml2
 , pkg-config
 , python3Packages
@@ -54,7 +53,6 @@ python3Packages.buildPythonApplication rec {
     gtk3
     libhandy
     libnotify
-    libsoup
   ];
 
   pythonPath = with python3Packages; [

pkgs/development/libraries/folks/default.nix

@@ -1,28 +1,22 @@
 { stdenv
 , lib
 , fetchurl
+, fetchpatch
 , pkg-config
 , meson
 , ninja
 , glib
 , gnome
-, nspr
 , gettext
 , gobject-introspection
 , vala
 , sqlite
-, libxml2
 , dbus-glib
-, libsoup
-, nss
 , dbus
 , libgee
 , evolution-data-server-gtk4
-, libsecret
-, db
 , python3
 , readline
-, gtk3
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
@@ -43,31 +37,35 @@ stdenv.mkDerivation rec {
     sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY=";
   };
 
+  patches = [
+    # Do not check for unneeded GTK dependency.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/folks/-/commit/686d58fb2454e5038bb951423245ed8c2d4b5cf6.patch";
+      sha256 = "0ydafVKhSrkHZK8bitPF5mNDTG5GrixGzBgBLNzLuXQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     gobject-introspection
-    gtk3
     gtk-doc
     docbook-xsl-nons
     docbook_xml_dtd_43
     meson
     ninja
     pkg-config
-    python3
     vala
+  ] ++ lib.optionals telepathySupport [
+    python3
   ];
 
   buildInputs = [
-    db
     dbus-glib
-    evolution-data-server-gtk4
-    libsecret
-    libsoup
-    libxml2
-    nspr
-    nss
+    evolution-data-server-gtk4 # UI part not needed, using gtk4 version to reduce system closure.
     readline
-  ] ++ lib.optional telepathySupport telepathy-glib;
+  ] ++ lib.optionals telepathySupport [
+    telepathy-glib
+  ];
 
   propagatedBuildInputs = [
     glib
@@ -105,9 +103,7 @@ stdenv.mkDerivation rec {
     runHook postCheck
   '';
 
-  postPatch = ''
-    chmod +x meson_post_install.py
-    patchShebangs meson_post_install.py
+  postPatch = lib.optionalString telepathySupport ''
     patchShebangs tests/tools/manager-file.py
   '';
 

pkgs/tools/misc/ostree/default.nix

@@ -15,7 +15,7 @@
 , e2fsprogs
 , libsoup
 , glib-networking
-, wrapGAppsHook
+, wrapGAppsNoGuiHook
 , gpgme
 , which
 , makeWrapper
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_42
-    wrapGAppsHook
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [