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

* Remove those storePath attribute sets, we don't need 'em.

Browse source
This commit is contained in:
Eelco Dolstra 2006-08-25 17:09:55 +00:00
parent e5678b3435
commit 4b66cebe7b
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/primops.cc
View file

@ -170,18 +170,7 @@ static void processBinding(EvalState & state, Expr e, Derivation & drv,
ss.push_back(outPath); ss.push_back(outPath);
} }
else if (a && evalString(state, a) == "storePath") { else throw TypeError("attribute sets in derivations must be derivations");
a = queryAttr(e, "outPath");
if (!a) throw EvalError("output path missing");
/* !!! supports only single output path */
Path outPath = evalPath(state, a);
drv.inputSrcs.insert(outPath);
ss.push_back(outPath);
}
else throw TypeError("attribute sets in derivations must either be derivations or store paths");
} }
else if (matchPath(e, s)) { else if (matchPath(e, s)) {

7
src/nix-env/main.cc
View file

@ -192,12 +192,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems,
makeBind(toATerm("derivations"), makeBind(toATerm("derivations"),
makeList(ATreverse(inputs)), makeNoPos()), makeList(ATreverse(inputs)), makeNoPos()),
makeBind(toATerm("manifest"), makeBind(toATerm("manifest"),
makeAttrs(ATmakeList2( makePath(toATerm(manifestFile)), makeNoPos())
makeBind(toATerm("type"),
makeStr(toATerm("storePath")), makeNoPos()),
makeBind(toATerm("outPath"),
makePath(toATerm(manifestFile)), makeNoPos())
)), makeNoPos())
))); )));
/* Instantiate it. */ /* Instantiate it. */