movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 05:38:57 +03:00
Code Activity

gnome3.gnome-flashback: 3.34.2 -> 3.36.0

Browse source 
* Removed the use of gnome-screensaver (https://gitlab.gnome.org/GNOME/gnome-flashback/issues/18)
* Flashback's menu-related environment variables are now set in the gnome3.nix module instead of gnome-panel to resolve dependency conflict.
This commit is contained in:
Tor Hedin Brønner 2020-02-09 01:39:46 +01:00 • committed by Jan Tojnar
parent b08e8ad727
commit 859c46c933
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 69 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -180,7 +180,7 @@ in
wmCommand = "${pkgs.gnome3.metacity}/bin/metacity";
} ++ cfg.flashback.customSessions);
security.pam.services.gnome-screensaver = {
security.pam.services.gnome-flashback = {
enableGnomeKeyring = true;
};
@ -191,9 +191,10 @@ in
inherit (wm) wmName;
}) cfg.flashback.customSessions);
services.dbus.packages = [
pkgs.gnome3.gnome-screensaver
];
# gnome-panel needs these for menu applet
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ];
# TODO: switch to sessionVariables (resolve conflict)
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ];
})
(mkIf serviceCfg.core-os-services.enable {