diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22T13·19+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-02-22T13·20+0100 |
| commit | e8d53bfdc94eea142542de92ff0822eb283d293f (patch) | |
| tree | 9c9ea013f69d3c85f528fe316ba565b2400111bf | |
| parent | eaa52c34b40aa2f899280e6aa99d5fa0a420ad3a (diff) | |
Revert "Enable sandbox builds on Linux by default"
This reverts commit ddc58e789636e1b94149c342575d92583251fbf6. https://hydra.nixos.org/eval/1435322
| -rw-r--r-- | doc/manual/release-notes/rl-2.0.xml | 4 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml index bf06d3786c22..25b9beb009b9 100644 --- a/doc/manual/release-notes/rl-2.0.xml +++ b/doc/manual/release-notes/rl-2.0.xml @@ -810,10 +810,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 xlink:href="https://github.com/NixOS/nix/commit/6de33a9c675b187437a2e1abbcb290981a89ecb1">now</link> diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 12917a438fa7..dd01f832df0c 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"}}; |