Merge pull request #1543 from matthewbauer/1.11-maintenance

OS X sandbox: Store .sb file in $TMPDIR rather than the Nix store
This commit is contained in:
Eelco Dolstra 2017-08-30 19:50:40 +02:00 committed by GitHub
commit 617dab1515
1 changed files with 1 additions and 4 deletions

View File

@ -778,7 +778,6 @@ private:
#if __APPLE__
typedef string SandboxProfile;
SandboxProfile additionalSandboxProfile;
AutoDelete autoDelSandbox;
#endif
/* Hash rewriting. */
@ -2633,9 +2632,7 @@ void DerivationGoal::runChild()
debug("Generated sandbox profile:");
debug(sandboxProfile);
Path sandboxFile = drvPath + ".sb";
if (pathExists(sandboxFile)) deletePath(sandboxFile);
autoDelSandbox.reset(sandboxFile, false);
Path sandboxFile = tmpDir + "/.sandbox.sb";
writeFile(sandboxFile, sandboxProfile);