nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 06:52:43 +01:00
Code Activity

Merge pull request #1543 from matthewbauer/1.11-maintenance

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build.cc
View file

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