From d60581d4d620787311e4268354680025eaeec27a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:26:54 -0500
Subject: [PATCH] Resolving that silly bad argument error.

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

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index f40faa1ca5f..3910831fb0e 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -119,7 +119,7 @@ in
       }
     ] ++
     (lib.optionals config.users.mutableUsers
-     map (x: x // { user = "root";
+     map (x: x // { owner   = "root";
                     group   = "root";
                     setuid  = true;
                   })
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 6b0570faa40..76a22b4f603 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -53,8 +53,6 @@ let
     { program
     , source ? null
     , owner  ? "nobody"
-    # Legacy code I can't find :(
-    , user   ? null
     , group  ? "nogroup"
     , setuid ? false
     , setgid ? false
@@ -64,7 +62,7 @@ let
 
       # Prevent races
       chmod 0000 ${permissionsWrapperDir}/${program}
-      chown ${if user != null then user else owner}.${group} ${permissionsWrapperDir}/${program}
+      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
     '';