Merge pull request #981 from jonringer/pure_eval

Allow for evaluator_pure_eval to be configured
This commit is contained in:
Eelco Dolstra 2021-09-27 20:25:01 +02:00 committed by GitHub
commit 19e668b7cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -274,6 +274,8 @@ int main(int argc, char * * argv)
myArgs.parseCmdline(argvToStrings(argc, argv)); myArgs.parseCmdline(argvToStrings(argc, argv));
auto pureEval = config->getBoolOption("evaluator_pure_eval", myArgs.flake);
/* FIXME: The build hook in conjunction with import-from-derivation is causing "unexpected EOF" during eval */ /* FIXME: The build hook in conjunction with import-from-derivation is causing "unexpected EOF" during eval */
settings.builders = ""; settings.builders = "";
@ -283,7 +285,7 @@ int main(int argc, char * * argv)
/* When building a flake, use pure evaluation (no access to /* When building a flake, use pure evaluation (no access to
'getEnv', 'currentSystem' etc. */ 'getEnv', 'currentSystem' etc. */
evalSettings.pureEval = myArgs.flake; evalSettings.pureEval = pureEval;
if (myArgs.dryRun) settings.readOnlyMode = true; if (myArgs.dryRun) settings.readOnlyMode = true;