guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into flakes

Browse Source
This commit is contained in:
Eelco Dolstra
2020-04-09 15:54:21 +02:00
parent 03a4a3c95c 30d4618cc9
commit d103c79144
27 changed files with 181 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/eval.cc
+2 -2
View File
@@ -5,7 +5,7 @@
#include "derivations.hh"
#include "globals.hh"
#include "eval-inline.hh"
#include "download.hh"
#include "filetransfer.hh"
#include "json.hh"
#include "function-trace.hh"
#include "flake/flake.hh"
@@ -1296,7 +1296,7 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
void ExprIf::eval(EvalState & state, Env & env, Value & v)
{
(state.evalBool(env, cond) ? then : else_)->eval(state, env, v);
(state.evalBool(env, cond, pos) ? then : else_)->eval(state, env, v);
}