From 8c4cce553c16438f0ccbbaea6d77f2bd64306dfe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 20 May 2020 11:24:21 +0200
Subject: [PATCH] Fix macOS build

---
 src/libstore/build.cc     | 11 +----------
 src/libstore/user-lock.cc | 13 +++++++++++++
 src/libstore/user-lock.hh |  2 ++
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 1f79a8d2d..6c3f94a76 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1420,11 +1420,7 @@ void DerivationGoal::tryToBuild()
 
 void DerivationGoal::tryLocalBuild() {
 
-    /* If `build-users-group' is not empty, then we have to build as
-       one of the members of that group. */
-    static bool useBuildUsers = (settings.buildUsersGroup != "" || settings.startId.get() != 0) && getuid() == 0;
-    if (useBuildUsers) {
-#if defined(__linux__) || defined(__APPLE__)
+    if (useBuildUsers()) {
         if (!buildUser)
             buildUser = acquireUserLock();
 
@@ -1439,11 +1435,6 @@ void DerivationGoal::tryLocalBuild() {
         /* Make sure that no other processes are executing under this
            uid. */
         buildUser->kill();
-#else
-        /* Don't know how to block the creation of setuid/setgid
-           binaries on this platform. */
-        throw Error("build users are not supported on this platform for security reasons");
-#endif
     }
 
     actLock.reset();
diff --git a/src/libstore/user-lock.cc b/src/libstore/user-lock.cc
index 8a09df4d1..2254386da 100644
--- a/src/libstore/user-lock.cc
+++ b/src/libstore/user-lock.cc
@@ -209,4 +209,17 @@ std::unique_ptr<UserLock> acquireUserLock()
         return SimpleUserLock::acquire();
 }
 
+bool useBuildUsers()
+{
+    #if __linux__
+    static bool b = (settings.buildUsersGroup != "" || settings.startId.get() != 0) && getuid() == 0;
+    return b;
+    #elif __APPLE__
+    static bool b = settings.buildUsersGroup != "" && getuid() == 0;
+    return b;
+    #else
+    return false;
+    #endif
+}
+
 }
diff --git a/src/libstore/user-lock.hh b/src/libstore/user-lock.hh
index 88d068689..bfb55b0d9 100644
--- a/src/libstore/user-lock.hh
+++ b/src/libstore/user-lock.hh
@@ -36,4 +36,6 @@ struct UserLock
    is available. */
 std::unique_ptr<UserLock> acquireUserLock();
 
+bool useBuildUsers();
+
 }