max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-24 06:56:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix macOS build

Browse source
This commit is contained in:
Eelco Dolstra 2020-05-20 11:24:21 +02:00
parent ba50c3efa3
commit 8c4cce553c
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/build.cc
View file

@ -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();

13
src/libstore/user-lock.cc
View file

@ -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
}
}

2
src/libstore/user-lock.hh
View file

@ -36,4 +36,6 @@ struct UserLock
is available. */
std::unique_ptr<UserLock> acquireUserLock();
bool useBuildUsers();
}