From 9a9e44ca048887ba5151c87853bd5f884e9b5d74 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 19 Sep 2023 23:54:26 +0800 Subject: [PATCH] pantheon.elementary-default-settings: Backport pantheon-portals.conf support See the changes in x-d-p 1.17 for details. Pantheon's config is quite complex compared to other DEs >_< gnome-keyring is already added to xdg.portal.extraPortals in its separate modules. --- .../desktop/elementary-default-settings/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 9b832ccde44a..dedf372d6e80 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -23,6 +24,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-j4K8qYwfu6/s4qnTSzwv6KRsk9f+Qr/l1bhLywKMHMU="; }; + patches = [ + # Add pantheon-portals.conf + # https://github.com/elementary/default-settings/pull/293 + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/8201eeb6a356e6059b505756ef7a556a6848ad3b.patch"; + sha256 = "sha256-qhGj7WQTAWJTC1kouUZhBWKqyO4hQWJghEhLVl8QVUM="; + }) + ]; + nativeBuildInputs = [ accountsservice dbus