diff options
| author | Shea Levy <shea@shealevy.com> | 2017-03-31T15·22-0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-03-31T15·22-0400 |
| commit | d299bd710a5c47b54a6f166c7e26608c10f41456 (patch) | |
| tree | a795c3dcacb6db330e56f57ab9d9ddc068437353 /src/libstore/globals.cc | |
| parent | b9b8b8a63ba49dc027b08950bd3cf30cc8f09ec5 (diff) | |
| parent | 0bb8db257d98a32abde759f4d07d28b5178bd3bf (diff) | |
Merge branch 'builtins.exec'
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 012b3d5b8b98..8c900be77b8f 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -67,7 +67,7 @@ Settings::Settings() envKeepDerivations = false; lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; showTrace = false; - enableImportNative = false; + enableNativeCode = false; netrcFile = fmt("%s/%s", nixConfDir, "netrc"); caFile = getEnv("NIX_SSL_CERT_FILE", getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt")); enableImportFromDerivation = true; @@ -179,7 +179,7 @@ void Settings::update() _get(envKeepDerivations, "env-keep-derivations"); _get(sshSubstituterHosts, "ssh-substituter-hosts"); _get(useSshSubstituter, "use-ssh-substituter"); - _get(enableImportNative, "allow-unsafe-native-code-during-evaluation"); + _get(enableNativeCode, "allow-unsafe-native-code-during-evaluation"); _get(useCaseHack, "use-case-hack"); _get(preBuildHook, "pre-build-hook"); _get(keepGoing, "keep-going"); |