diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2020-02-09 01:39:46 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 07:10:58 +0100 |
| commit | 859c46c933a7705bc5daaab73ebf0861bc206f6e (patch) | |
| tree | 8ea912bb9c8911903075615791c90cbed7416940 /nixos | |
| parent | b08e8ad727b204d30be7b62cbd375c7d32889a8a (diff) | |
| download | nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar.gz nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar.bz2 nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar.lz nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar.xz nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.tar.zst nixpkgs-859c46c933a7705bc5daaab73ebf0861bc206f6e.zip | |
gnome3.gnome-flashback: 3.34.2 -> 3.36.0
* 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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome3.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5756cf14ed9..c053533621a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -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 { |