lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Handle store path arguments in `nix-env -i' correctly again.

Browse source
This commit is contained in:
Eelco Dolstra 2005-05-09 17:55:35 +00:00
parent bfe4875a5e
commit 9ec7e58aa4
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,11 @@ typedef void (* Operation) (Globals & globals,
struct UserEnvElem
{
private:
string drvPath;
string outPath;
public:
string name;
string system;
@ -56,15 +61,31 @@ struct UserEnvElem
string queryDrvPath(EvalState & state) const
{
if (drvPath == "") {
Expr a = attrs.get("drvPath");
return a ? evalPath(state, a) : "";
(string &) drvPath = a ? evalPath(state, a) : "";
}
return drvPath;
}
string queryOutPath(EvalState & state) const
{
if (outPath == "") {
Expr a = attrs.get("outPath");
if (!a) throw Error("output path missing");
return evalPath(state, a);
(string &) outPath = evalPath(state, a);
}
return outPath;
}
void setDrvPath(const string & s)
{
drvPath = s;
}
void setOutPath(const string & s)
{
outPath = s;
}
};
@ -394,13 +415,13 @@ static void queryInstSources(EvalState & state,
name = string(name, dash + 1);
if (isDerivation(*i)) {
elem.queryDrvPath(state) = *i;
elem.queryOutPath(state) = findOutput(derivationFromPath(*i), "out");
elem.setDrvPath(*i);
elem.setOutPath(findOutput(derivationFromPath(*i), "out"));
if (name.size() >= drvExtension.size() &&
string(name, name.size() - drvExtension.size()) == drvExtension)
name = string(name, 0, name.size() - drvExtension.size());
}
else elem.queryOutPath(state) = *i;
else elem.setOutPath(*i);
elem.name = name;