From fc096a6d9cd3736df7ea1ce9b369ccfeedf07746 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 6 Oct 2023 11:40:20 +0800 Subject: 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. --- nixos/modules/services/x11/desktop-managers/gnome.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nixos/modules/services/x11') 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 { -- cgit 1.4.1