puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

more error fixes

Browse source
This commit is contained in:
Ben Burdette 2021-08-18 20:02:23 -06:00
parent e82cf13b1e
commit 2272021536
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -1667,8 +1667,8 @@ void ExprWith::eval(EvalState & state, Env & env, Value & v)
env2.values[0] = (Value *) attrs; env2.values[0] = (Value *) attrs;
if (debuggerHook) { if (debuggerHook) {
forceAttrs(attrs); state.forceAttrs(*env2.values[0]);
env2.valuemap = mapBindings(attrs->attrs); env2.valuemap.reset(mapBindings(*env2.values[0]->attrs));
} }
@ -2132,12 +2132,13 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context,
} }
string EvalState::copyPathToStore(Env &env, PathSet & context, const Path & path) string EvalState::copyPathToStore(PathSet & context, const Path & path)
{ {
if (nix::isDerivation(path)) if (nix::isDerivation(path))
throwEvalError("file names are not allowed to end in '%1%'", throwEvalError("file names are not allowed to end in '%1%'",
drvExtension, drvExtension,
map0()); fakeEnv(1));
// map0());
Path dstPath; Path dstPath;
auto i = srcToStore.find(path); auto i = srcToStore.find(path);