mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-14 11:57:34 +00:00
Code Activity

nix-daemon: fix activation script

Browse source
This commit is contained in:
Daiderd Jordan 2017-02-19 15:49:54 +01:00
parent 2e7ee7fc5d
commit 39827d4335
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/nix/default.nix
View file

@ -5,6 +5,7 @@ with lib;
let
cfg = config.nix;
daemon = config.services.nix-daemon;
nixConf =
let
@ -19,7 +20,7 @@ let
# WARNING: this file is generated from the nix.* options in
# your NixOS configuration, typically
# /etc/nixos/configuration.nix. Do not edit it!
${optionalString config.services.nix-daemon.enable ''
${optionalString daemon.enable ''
build-users-group = nixbld
''}
build-max-jobs = ${toString cfg.maxJobs}
@ -356,5 +357,13 @@ in
fi
'';
system.activationScripts.nix-daemon.text = mkIf daemon.enable ''
buildUser=$(dscl . -read /Groups/nixbld 2>&1 | awk '/^GroupMembership: / {print $2}')
if [ -z $buildUser ]; then
echo "Using the nix-daemon requires build users, aborting activation" >&2
exit 2
fi
'';
};
}

8
modules/services/nix-daemon.nix
View file

@ -51,13 +51,5 @@ in
// { TMPDIR = "${cfg.tempDir}"; };
};
system.activationScripts.nix-daemon.text = mkIf cfg.enable ''
buildUser=$(dscl . -read /Groups/nixbld 2>&1 | awk '/^GroupMembership: / {print $2}')
if [ -z $buildUser ]; then
echo "Using the nix-daemon requires build users, aborting activation" >&2
exit 2
fi
'';
};
}