summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 17:10:32 -0600
committerParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 17:10:32 -0600
commit264db4e30936cbb4dd9f88123aafb42a5259e74f (patch)
tree92b00c1bf0fdb8049cb85fbe1e710d6c5c1d286c /nixos/modules/programs
parentf2f3f1479e18b530b57628c7d7725283afb57ac4 (diff)
downloadnixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar.gz
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar.bz2
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar.lz
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar.xz
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.tar.zst
nixpkgs-264db4e30936cbb4dd9f88123aafb42a5259e74f.zip
Set merge + mkIf always surprises me
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/shadow.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index d497b662113..0f3f42901ba 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 {});
   };
 }