maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'builtins.exec'

Browse source
This commit is contained in:
Shea Levy 2017-03-31 11:22:39 -04:00
commit d299bd710a
3 changed files with 59 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/globals.cc
View file

@ -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");

4
src/libstore/globals.hh
View file

@ -181,8 +181,8 @@ struct Settings {
/* Whether to show a stack trace if Nix evaluation fails. */
bool showTrace;
/* Whether the importNative primop should be enabled */
bool enableImportNative;
/* Whether native-code enabling primops should be enabled */
bool enableNativeCode;
/* The hook to run just before a build to set derivation-specific
build settings */