nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

Checkpoint

Browse source
This commit is contained in:
Eelco Dolstra 2019-04-23 00:39:14 +02:00
parent 7c716b4c49
commit ae5b76a5a4
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.cc
View file

@ -1330,8 +1330,9 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v)
bool first = !forceString;
Tag firstType = tString;
auto vTmp = state.allocValue();
for (auto & i : *es) {
Root<Value> vTmp;
i->eval(state, env, vTmp);
/* If the first element is a path, then the result will also
@ -1534,7 +1535,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
if (v.type == tAttrs) {
auto i = v.attrs->find(sToString);
if (i != v.attrs->end()) {
Root<Value> v1;
auto v1 = allocValue();
callFunction(*i->value, v, v1, pos);
return coerceToString(pos, v1, context, coerceMore, copyToStore);
}