pantheon.elementary-session-settings: remove gnome-keyring.ssh.desktop autostart
This commit is contained in:
parent
faed89ee77
commit
c5797e8556
@ -19,7 +19,6 @@
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-session-settings";
|
||||
version = "8.0.1";
|
||||
@ -31,6 +30,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-4B7lUjHEa4LdKrmsFCB3iFIsdVd/rgwmtQUAgAj3rXs=";
|
||||
};
|
||||
|
||||
/*
|
||||
This allows `elementary-session-settings` to not use gnome-keyring's ssh capabilities anymore, as they have been
|
||||
moved to gcr upstream, in an effort to modularize gnome-keyring.
|
||||
|
||||
More info can be found here: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60
|
||||
*/
|
||||
patches = [ ./no-gnome-keyring-ssh-autostart.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gettext
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/session/meson.build b/session/meson.build
|
||||
index 501e836..3254658 100644
|
||||
--- a/session/meson.build
|
||||
+++ b/session/meson.build
|
||||
@@ -79,7 +79,6 @@ if get_option('detect-program-prefixes') == true
|
||||
autostarts = {
|
||||
'gnome-keyring-pkcs11': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-pkcs11.desktop'),
|
||||
'gnome-keyring-secrets': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-secrets.desktop'),
|
||||
- 'gnome-keyring-ssh': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-ssh.desktop'),
|
||||
'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
|
||||
'orca-autostart': join_paths(orca_prefix, 'etc/xdg/autostart', 'orca-autostart.desktop'),
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user