diff options
Diffstat (limited to 'third_party/nix/src/libexpr/eval.cc')
| -rw-r--r-- | third_party/nix/src/libexpr/eval.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc index a834e097a5..2b825bfd27 100644 --- a/third_party/nix/src/libexpr/eval.cc +++ b/third_party/nix/src/libexpr/eval.cc @@ -19,6 +19,7 @@ #include "libexpr/eval-inline.hh" #include "libexpr/function-trace.hh" +#include "libexpr/value.hh" #include "libstore/derivations.hh" #include "libstore/download.hh" #include "libstore/globals.hh" @@ -1240,11 +1241,9 @@ void ExprOpUpdate::eval(EvalState& state, Env& env, Value& dest) { state.nrOpUpdates++; - state.mkAttrs(dest, v1.attrs->size() + v2.attrs->size()); - - // Merge the sets, preferring values from the second set. - dest.attrs->merge(*v1.attrs); - dest.attrs->merge(*v2.attrs); + clearValue(dest); + dest.type = tAttrs; + dest.attrs = Bindings::Merge(*v1.attrs, *v2.attrs); } void ExprOpConcatLists::eval(EvalState& state, Env& env, Value& v) { |