diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-10-06 11:40:20 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-10-06 12:18:53 +0800 |
| commit | fc096a6d9cd3736df7ea1ce9b369ccfeedf07746 (patch) | |
| tree | 838b09024fadf38de425b2e85bb9c1aa95f907c4 /nixos/modules/services/x11 | |
| parent | 7131f3c223a2d799568e4b278380cd9dac2b8579 (diff) | |
| download | nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar.gz nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar.bz2 nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar.lz nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar.xz nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.tar.zst nixlib-fc096a6d9cd3736df7ea1ce9b369ccfeedf07746.zip | |
nixosTests.gnome-flashback: Fix eval
The option `nodes.machine.environment.variables.XDG_CONFIG_DIRS' is defined multiple times while it's expected to be unique.
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index a5c7cb16b9d3..ce8f2548a5ad 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -307,10 +307,9 @@ in gnome-flashback ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; - # gnome-panel needs these for menu applet - environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; - # TODO: switch to sessionVariables (resolve conflict) - environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; + environment.systemPackages = with pkgs.gnome; [ + gnome-flashback + ]; }) (mkIf serviceCfg.core-os-services.enable { |