From b883ae533fa01d560aa474caca2c4e98045fd3c2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 18 Jul 2017 20:19:53 +0200
Subject: [PATCH] nix-daemon: fix nixbld group warning

---
 modules/nix/default.nix         | 9 ---------
 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 b91d3c6e..0bd18d37 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 39735c0d..cca8db86 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
+    '';
+
   };
 }