From 2af5f0fb9e554ea3c85e57d35a5f2ed5a10b8867 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 10 Sep 2024 21:32:06 +0100
Subject: [PATCH] checks: factor out `nix.useDaemon` check

---
 modules/system/checks.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/checks.nix b/modules/system/checks.nix
index 6afce81d..1cfe1c8d 100644
--- a/modules/system/checks.nix
+++ b/modules/system/checks.nix
@@ -242,7 +242,9 @@ in
 
     system.checks.verifyBuildUsers = mkOption {
       type = types.bool;
-      default = !(config.nix.settings.auto-allocate-uids or false);
+      default =
+        (config.nix.useDaemon && !(config.nix.settings.auto-allocate-uids or false))
+        || config.nix.configureBuildUsers;
       description = "Whether to run the Nix build users validation checks.";
     };
 
@@ -259,7 +261,7 @@ in
       darwinChanges
       runLink
       oldBuildUsers
-      (mkIf (config.nix.useDaemon && cfg.verifyBuildUsers) buildUsers)
+      (mkIf cfg.verifyBuildUsers buildUsers)
       (mkIf (!config.nix.useDaemon) singleUser)
       nixStore
       (mkIf (config.nix.gc.automatic && config.nix.gc.user == null) nixGarbageCollector)