From e8d53bfdc94eea142542de92ff0822eb283d293f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 22 Feb 2018 14:19:20 +0100
Subject: [PATCH] Revert "Enable sandbox builds on Linux by default"

This reverts commit ddc58e789636e1b94149c342575d92583251fbf6.

https://hydra.nixos.org/eval/1435322
---
 doc/manual/release-notes/rl-2.0.xml | 4 ----
 src/libstore/globals.hh             | 8 +-------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml
index bf06d3786..25b9beb00 100644
--- a/doc/manual/release-notes/rl-2.0.xml
+++ b/doc/manual/release-notes/rl-2.0.xml
@@ -809,10 +809,6 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
 
 <itemizedlist>
 
-  <listitem>
-    <para>Sandbox builds are now enabled by default on Linux.</para>
-  </listitem>
-
   <listitem>
     <para>Values such as Booleans, integers, (nested) lists and
     attribute sets can <link
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 12917a438..dd01f832d 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -220,13 +220,7 @@ public:
     Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation",
         "Whether builtin functions that allow executing native code should be enabled."};
 
-    Setting<SandboxMode> sandboxMode{this,
-        #if __linux__
-          smEnabled
-        #else
-          smDisabled
-        #endif
-        , "sandbox",
+    Setting<SandboxMode> sandboxMode{this, smDisabled, "sandbox",
         "Whether to enable sandboxed builds. Can be \"true\", \"false\" or \"relaxed\".",
         {"build-use-chroot", "build-use-sandbox"}};