From 2156c30ad2e3052384ca2083267b4f47e315c2ac Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 18 Jul 2017 20:32:32 +0200
Subject: [PATCH] nix-daemon: fix eval

---
 modules/nix/default.nix         | 8 ++++++++
 modules/services/nix-daemon.nix | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 0bd18d3..6d65574 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -357,5 +357,13 @@ in
       fi
     '';
 
+    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
+    '';
+
   };
 }
diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix
index 73df691..39735c0 100644
--- a/modules/services/nix-daemon.nix
+++ b/modules/services/nix-daemon.nix
@@ -51,13 +51,5 @@ in
         // { TMPDIR = "${cfg.tempDir}"; };
     };
 
-    system.activationScripts.nix-daemon.text = ''
-      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
-    '';
-
   };
 }