mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-11 00:36:20 +02:00
more error fixes
This commit is contained in:
parent
e82cf13b1e
commit
2272021536
1 changed files with 5 additions and 4 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue