diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
| commit | d103c79144723d95eb3650593ad4d3e96abe59d3 (patch) | |
| tree | 44bc23261fe42a60afa666ab770cf8d7f55c5138 /src/libexpr/eval.cc | |
| parent | 03a4a3c95cf0e10cd05c1c4ce9dd35c9fc64c331 (diff) | |
| parent | 30d4618cc944a41c2ca202babd0be0da4a1cd9d2 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libexpr/eval.cc')
| -rw-r--r-- | src/libexpr/eval.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 6fcb2917c..c5945adf0 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -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); } |