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

Fix build-remote in nix-static

Browse source 
'build-remote' is now executed via /proc/self/exe so it always works.
This commit is contained in:
Eelco Dolstra 2022-06-22 22:43:53 +02:00
parent 3c48c4b4f7
commit d3176ce076
7 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/globals.cc
View file

@ -67,12 +67,13 @@ Settings::Settings()
sandboxPaths = tokenizeString<StringSet>("/bin/sh=" SANDBOX_SHELL);
#endif
/* chroot-like behavior from Apple's sandbox */
/* chroot-like behavior from Apple's sandbox */
#if __APPLE__
sandboxPaths = tokenizeString<StringSet>("/System/Library/Frameworks /System/Library/PrivateFrameworks /bin/sh /bin/bash /private/tmp /private/var/tmp /usr/lib");
allowedImpureHostPrefixes = tokenizeString<StringSet>("/System/Library /usr/lib /dev /bin/sh");
#endif
buildHook = getSelfExe().value_or("nix") + " __build-remote";
}
void loadConfFile()