alois31/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

fix build with latest Lix

Browse source 
Lix commit 4dbbd721e[1] changed the way settings are changed, removing
operator= in the process. This commit changes the places where we use
operator= to using either setDefault(), or override(). I *believe* I
have used the correct ones for each changed setting.

Fixes #13.

[1]: 4dbbd721eb9db75d4968a624b8cb9e75e979a144
This commit is contained in:
Qyriad 2024-10-25 14:29:57 -06:00
parent 50a1455953
commit 43aaa943bf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nix-eval-jobs.cc
View file

@ -350,18 +350,18 @@ int main(int argc, char **argv) {
/* FIXME: The build hook in conjunction with import-from-derivation is /* FIXME: The build hook in conjunction with import-from-derivation is
* causing "unexpected EOF" during eval */ * causing "unexpected EOF" during eval */
settings.builders = ""; settings.builders.setDefault("");
/* Prevent access to paths outside of the Nix search path and /* Prevent access to paths outside of the Nix search path and
to the environment. */ to the environment. */
evalSettings.restrictEval = false; evalSettings.restrictEval.setDefault(false);
/* 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. */
if (myArgs.impure) { if (myArgs.impure) {
evalSettings.pureEval = false; evalSettings.pureEval.setDefault(false);
} else if (myArgs.flake) { } else if (myArgs.flake) {
evalSettings.pureEval = true; evalSettings.pureEval.setDefault(true);
} }
if (myArgs.releaseExpr == "") if (myArgs.releaseExpr == "")
@ -374,7 +374,7 @@ int main(int argc, char **argv) {
} }
if (myArgs.showTrace) { if (myArgs.showTrace) {
loggerSettings.showTrace.assign(true); loggerSettings.showTrace.override(true);
} }
Sync<State> state_; Sync<State> state_;