diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml index bf06d3786c22af50f7880cefb7f1ad2b81130958..25b9beb009b90011351b53afda60848a64e5d951 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 12917a438fa7ac38bfa56cebf2d57ff37daf03cb..dd01f832df0c9e64ba41b7d92c82ff1ccf60a10d 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"}};