about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2021-09-22 15:53:29 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2021-09-22 15:53:29 +0200
commit22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27 (patch)
tree8e788465d307962ffaee47eb5f8c683f3d4b7ad3 /nixos
parenta8576d4053a1bd5789748090aef475ff958627b4 (diff)
downloadnixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar.gz
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar.bz2
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar.lz
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar.xz
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.tar.zst
nixlib-22d05f8fa2bb4ed7d6371dd3d1b7b21c28c78f27.zip
nixos/plotinus: fix evaluation
Apparently setting a variable via `environment.variables` when the same
is already present in `environment.sessionVariables` (that is merged
into the former option) creates a conflict.

For reference: this started with the change in #101274.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/plotinus.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/plotinus.nix b/nixos/modules/programs/plotinus.nix
index e3549c79588b..2c90a41ba029 100644
--- a/nixos/modules/programs/plotinus.nix
+++ b/nixos/modules/programs/plotinus.nix
@@ -30,7 +30,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ];
+    environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ];
     environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ];
   };
 }