lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Revert "Enable sandbox builds on Linux by default"

Browse source 
This reverts commit ddc58e7896.

https://hydra.nixos.org/eval/1435322
This commit is contained in:
Eelco Dolstra 2018-02-22 14:19:20 +01:00
parent eaa52c34b4
commit e8d53bfdc9
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/release-notes/rl-2.0.xml
View file

@ -809,10 +809,6 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
<itemizedlist> <itemizedlist>
<listitem>
<para>Sandbox builds are now enabled by default on Linux.</para>
</listitem>
<listitem> <listitem>
<para>Values such as Booleans, integers, (nested) lists and <para>Values such as Booleans, integers, (nested) lists and
attribute sets can <link attribute sets can <link

8
src/libstore/globals.hh
View file

@ -220,13 +220,7 @@ public:
Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation", Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation",
"Whether builtin functions that allow executing native code should be enabled."}; "Whether builtin functions that allow executing native code should be enabled."};
Setting<SandboxMode> sandboxMode{this, Setting<SandboxMode> sandboxMode{this, smDisabled, "sandbox",
#if __linux__
smEnabled
#else
smDisabled
#endif
, "sandbox",
"Whether to enable sandboxed builds. Can be \"true\", \"false\" or \"relaxed\".", "Whether to enable sandboxed builds. Can be \"true\", \"false\" or \"relaxed\".",
{"build-use-chroot", "build-use-sandbox"}}; {"build-use-chroot", "build-use-sandbox"}};