From 264db4e30936cbb4dd9f88123aafb42a5259e74f Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 17:10:32 -0600
Subject: [PATCH] Set merge + mkIf always surprises me

---
 nixos/modules/programs/shadow.nix           | 4 ++--
 nixos/modules/security/pam.nix              | 4 ++--
 nixos/modules/security/wrappers/default.nix | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index d497b6621130..0f3f42901bab 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -106,10 +106,10 @@ in
       chfn.source      = "${pkgs.shadow.out}/bin/chfn";
       newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
       newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
-    } // (lib.mkIf config.users.mutableUsers {
+    } // (if config.users.mutableUsers then {
       passwd.source    = "${pkgs.shadow.out}/bin/passwd";
       sg.source        = "${pkgs.shadow.out}/bin/sg";
       newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";
-    });
+    } else {});
   };
 }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 711e4c55c7d5..3cc5db2fb9b3 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -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;
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 73b4cad86878..71799175011c 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -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 = ''