diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-07-18 20:19:53 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-07-18 20:19:53 +0200 |
| commit | b883ae533fa01d560aa474caca2c4e98045fd3c2 (patch) | |
| tree | e80b06b8d7d21407b9d987d4c8f019c2869feda6 /modules | |
| parent | 6a52afb886d391261a70bc67f1a38a208585abb4 (diff) | |
nix-daemon: fix nixbld group warning
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 9 | ||||
| -rw-r--r-- | modules/services/nix-daemon.nix | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index b91d3c6..0bd18d3 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -357,14 +357,5 @@ 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 - export NIX_REMOTE= - exit 2 - fi - ''; - }; } diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix index 39735c0..cca8db8 100644 --- a/modules/services/nix-daemon.nix +++ b/modules/services/nix-daemon.nix @@ -51,5 +51,13 @@ in // { TMPDIR = "${cfg.tempDir}"; }; }; + system.activationScripts.nix-daemon.text = mkIf daemon.enable '' + buildUser=$(dscl . -read /Groups/nixbld 2>&1 | awk '/^GroupMembership: / {print $2}') || true + if [ -z $buildUser ]; then + echo "Using the nix-daemon requires build users, aborting activation" >&2 + exit 2 + fi + ''; + }; } |