summary refs log tree commit diff
path: root/nixos/modules/services/misc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-10 13:07:10 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-06-10 13:07:10 +0200
commit8ae659f16c0f2706bd264ba3ee880f265a847438 (patch)
tree4deed69afb88d9522207c8d5e9e39daa31bf3130 /nixos/modules/services/misc
parent491c088731022463978e595956427e72db6306a9 (diff)
downloadnixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.gz
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.bz2
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.lz
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.xz
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.tar.zst
nixlib-8ae659f16c0f2706bd264ba3ee880f265a847438.zip
Revert "Revert "Merge #2692: Use pam_env to properly setup system-wide env""
This reverts commit 491c088731022463978e595956427e72db6306a9.
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4bfd6268234d..f373657b7918 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -318,7 +318,7 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.variables = cfg.envVars;
+    environment.systemVariables = cfg.envVars;
 
     environment.extraInit =
       ''