From 5641fce009b1012f0e77d6165d64315a72a90159 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 25 Oct 2022 10:41:52 +0800 Subject: [PATCH] gnome.gnome-settings-daemon338: avoid libsoup2 symbols gsd-datetime: "libsoup2 symbols detected. Using libsoup2 and libsoup3 in the same process is not supported." --- .../gnome/core/gnome-settings-daemon/3.38/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index 8ab848a7dfa8..d9a67183e3c3 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -31,7 +31,7 @@ , modemmanager , networkmanager , gnome-desktop -, geocode-glib +, geocode-glib_2 , docbook_xsl , wrapGAppsHook , python3 @@ -93,6 +93,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; }) + + # Use geocode-glib_2 dependency + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/300 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/03739474621e579e10b72577960ff94b4001e7ff.patch"; + sha256 = "W4uD4ChNPZSsmQfmfmmXFA2Sm1RDkV7MqG8DmT4qeCY="; + }) ]; nativeBuildInputs = [ @@ -126,7 +133,7 @@ stdenv.mkDerivation rec { libgweather nss polkit - geocode-glib + geocode-glib_2 geoclue2 systemd libgudev