diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-27T09·18+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-27T09·18+0200 |
| commit | d7be6d45d97e89653b77686bdb39b833afbcf6ca (patch) | |
| tree | 74d8e8f480979061d1b1b09198fa671f774f7af9 /src/libstore/globals.cc | |
| parent | 9d0709e8c47082cec35d6412053eacfadae23bcd (diff) | |
| parent | d62f46e500958bc97ae6837911e27c20a47cc181 (diff) | |
Merge branch 'shlevy-import-native'
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 180344e336b0..5d359e12811f 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -61,6 +61,7 @@ Settings::Settings() envKeepDerivations = false; lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; showTrace = false; + enableImportNative = false; } @@ -148,6 +149,7 @@ void Settings::update() get(sshSubstituterHosts, "ssh-substituter-hosts"); get(useSshSubstituter, "use-ssh-substituter"); get(logServers, "log-servers"); + get(enableImportNative, "allow-arbitrary-code-during-evaluation"); string subs = getEnv("NIX_SUBSTITUTERS", "default"); if (subs == "default") { |