aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.cc
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-06-22 22:43:53 +0200
committerEelco Dolstra <edolstra@gmail.com>2022-06-23 01:32:46 +0200
commitd3176ce076407ef3e63667c0436bccf8be317ae4 (patch)
tree8dcaaab834d6afa14948239e6e6c864ba025e8e6 /src/libstore/globals.cc
parent3c48c4b4f7a8d5a7b045b9dbee1310d20ca7750b (diff)
Fix build-remote in nix-static
'build-remote' is now executed via /proc/self/exe so it always works.
Diffstat (limited to 'src/libstore/globals.cc')
-rw-r--r--src/libstore/globals.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index cc009a026..1d7f65135 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -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()