summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers
diff options
context:
space:
mode:
authorMichael Raitza <spacefrogg-github@meterriblecrew.net>2015-11-22 21:25:11 +0100
committerMichael Raitza <spacefrogg-github@meterriblecrew.net>2015-11-22 21:25:11 +0100
commit338576cace63c53e5b258d063e4fc7a630c01135 (patch)
tree8a157c982642d64563772e12d952f19922f21791 /nixos/modules/services/x11/display-managers
parentf591a171f884e7a865b90c1bbe104203ef33a86b (diff)
downloadnixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar.gz
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar.bz2
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar.lz
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar.xz
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.tar.zst
nixlib-338576cace63c53e5b258d063e4fc7a630c01135.zip
display-managers: fix pam_env.so usage
 Fixed usage of pam_env.so PAM module in lightDM and GDM.
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix2
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 58eb6f050131..52847d2f8d2c 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -162,7 +162,7 @@ in
 
       gdm.text = ''
         auth     requisite      pam_nologin.so
-        auth     required       pam_env.so
+        auth     required       pam_env.so envfile=${config.system.build.pamEnvironment}
 
         auth     required       pam_succeed_if.so uid >= 1000 quiet
         auth     optional       ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 11e21c9d917f..8452b1ec33cd 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -150,7 +150,7 @@ in
       allowNullPassword = true;
       startSession = true;
       text = ''
-        auth     required pam_env.so
+        auth     required pam_env.so envfile=${config.system.build.pamEnvironment}
         auth     required pam_permit.so
 
         account  required pam_permit.so