From a41c3dedb18201aa689206079e203f41c9bef389 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 6 Aug 2020 02:54:22 +0100
Subject: chore(tvix): Disable sandboxing by default until its time comes

Change-Id: Ifcc776841924abcb43fb115f3de569fe500756c8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1682
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
---
 third_party/nix/src/libstore/globals.hh | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'third_party')

diff --git a/third_party/nix/src/libstore/globals.hh b/third_party/nix/src/libstore/globals.hh
index 7799ff28502f..54defff06bd1 100644
--- a/third_party/nix/src/libstore/globals.hh
+++ b/third_party/nix/src/libstore/globals.hh
@@ -243,21 +243,14 @@ class Settings : public Config {
       this, false, "show-trace",
       "Whether to show a stack trace on evaluation errors."};
 
-  Setting<SandboxMode> sandboxMode {
-    this,
-#if __linux__
-        smEnabled
-#else
-        smDisabled
-#endif
-        ,
-        "sandbox",
-        "Whether to enable sandboxed builds. Can be \"true\", \"false\" or "
-        "\"relaxed\".",
-    {
-      "build-use-chroot", "build-use-sandbox"
-    }
-  };
+  Setting<SandboxMode> sandboxMode{
+      this,
+      // TODO(tazjin): Turn sandboxing back on once it is time.
+      smDisabled,
+      "sandbox",
+      "Whether to enable sandboxed builds. Can be \"true\", \"false\" or "
+      "\"relaxed\".",
+      {"build-use-chroot", "build-use-sandbox"}};
 
   Setting<PathSet> sandboxPaths{
       this,
-- 
cgit 1.4.1