Set merge + mkIf always surprises me

This commit is contained in:
Parnell Springmeyer
2017-01-29 17:10:32 -06:00
parent f2f3f1479e
commit 264db4e309
3 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -478,10 +478,10 @@ in
owner = "root";
setuid = true;
};
} // (mkIf config.security.pam.enableEcryptfs {
} // (if config.security.pam.enableEcryptfs then {
"mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
"umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
});
} else {});
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
@@ -152,6 +152,9 @@ in
###### implementation
config = {
security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
# Make sure our wrapperDir exports to the PATH env variable when
# initializing the shell
environment.extraInit = ''