wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Fix non-Darwin build

Browse source
This commit is contained in:
Eelco Dolstra 2016-01-05 13:31:15 +01:00
parent 29c0199d5c
commit 743e310046
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1729,9 +1729,11 @@ void DerivationGoal::startBuilder()
if (get(drv->env, "__noChroot") == "1") if (get(drv->env, "__noChroot") == "1")
throw Error(format("derivation ‘%1%’ has ‘__noChroot’ set, " throw Error(format("derivation ‘%1%’ has ‘__noChroot’ set, "
"but that's not allowed when ‘build-use-sandbox’ is ‘true’") % drvPath); "but that's not allowed when ‘build-use-sandbox’ is ‘true’") % drvPath);
#if __APPLE__
if (additionalSandboxProfile != "") if (additionalSandboxProfile != "")
throw Error(format("derivation ‘%1%’ specifies a sandbox profile, " throw Error(format("derivation ‘%1%’ specifies a sandbox profile, "
"but this is only allowed when ‘build-use-sandbox’ is ‘relaxed’") % drvPath); "but this is only allowed when ‘build-use-sandbox’ is ‘relaxed’") % drvPath);
#endif
useChroot = true; useChroot = true;
} }
else if (x == "false") else if (x == "false")