diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-19T13·55+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-19T13·55+0100 |
commit | c33244d7c19a43173676d14215e188270f31f115 (patch) | |
tree | 04b336817bef045562b2a9c132994834a5b6c9b7 /src/libexpr/eval.cc | |
parent | 9bedd9b09b0b622286498b079207b80a4bbd1118 (diff) | |
parent | c4653afbcd96bf8f43bb54c1c2f79a27fd615e11 (diff) |
Merge branch 'tilde-paths' of https://github.com/shlevy/nix
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r-- | src/libexpr/eval.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 298f6a3a60e3..95b56e84d89a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1174,7 +1174,8 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v) else if (firstType == tPath) { if (!context.empty()) throwEvalError("a string that refers to a store path cannot be appended to a path, at %1%", pos); - mkPath(v, s.str().c_str()); + auto path = canonPath(s.str()); + mkPath(v, path.c_str()); } else mkString(v, s.str(), context); } |