From 39827d4335ad16c165ef95d8f051e9804c013c7f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 19 Feb 2017 15:49:54 +0100
Subject: [PATCH] nix-daemon: fix activation script

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

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 77019370..3c749f43 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -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
+    '';
+
   };
 }
diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix
index c523640d..7b42fc62 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 = 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
-    '';
-
   };
 }