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

* Compatibility with older GCCs.

Browse source
This commit is contained in:
Eelco Dolstra 2005-02-15 12:05:47 +00:00
parent e17910cfb5
commit 202d5bbda5
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,8 @@ static void queryInstSources(EvalState & state,
argument, e.g., if the file is `./foo.nix', then the argument, e.g., if the file is `./foo.nix', then the
argument `x: x.bar' is equivalent to `(x: x.bar) argument `x: x.bar' is equivalent to `(x: x.bar)
(import ./foo.nix)' = `(import ./foo.nix).bar'. */ (import ./foo.nix)' = `(import ./foo.nix).bar'. */
case srcNixExprs: case srcNixExprs: {
Expr e1 = parseExprFromFile(state, Expr e1 = parseExprFromFile(state,
absPath(instSource.nixExprPath)); absPath(instSource.nixExprPath));
@ -355,8 +356,12 @@ static void queryInstSources(EvalState & state,
} }
break; break;
}
case srcStorePaths: /* The available user environment elements are specified as a
list of store paths (which may or may not be
derivations). */
case srcStorePaths: {
for (Strings::const_iterator i = args.begin(); for (Strings::const_iterator i = args.begin();
i != args.end(); ++i) i != args.end(); ++i)
@ -384,13 +389,18 @@ static void queryInstSources(EvalState & state,
} }
break; break;
}
case srcProfile: /* Get the available user environment elements from another
user environment. These are then filtered as in the
`srcNixExprDrvs' case. */
case srcProfile: {
elems = filterBySelector( elems = filterBySelector(
queryInstalled(state, instSource.profile), args); queryInstalled(state, instSource.profile), args);
break; break;
} }
} }
}
static void installDerivations(Globals & globals, static void installDerivations(Globals & globals,