summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2017-08-22 11:46:16 -0400
committerBenjamin Staffin <benley@gmail.com>2017-08-22 11:52:14 -0400
commit2e65e2df94b39d17ff7f52ea76b7eca285b66d05 (patch)
tree2a41af1c15cbd994c012985f806a670cccaea710
parentgit-annex: update to version 6.20170818 (diff)
downloadnixpkgs-2e65e2df94b39d17ff7f52ea76b7eca285b66d05.tar.gz
nixos: Fix pam_kwallet5 integration
Fixes #28469
-rw-r--r--nixos/modules/security/pam.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 5632500df2e0..ede4ace5ed03 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -281,7 +281,7 @@ let
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString cfg.enableKwallet
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+ " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
'') + ''
${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -350,7 +350,7 @@ let
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
${optionalString (cfg.enableKwallet)
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+ " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
'');
};