diff options
Diffstat (limited to 'src/nix-env')
| -rw-r--r-- | src/nix-env/nix-env.cc | 6 | ||||
| -rw-r--r-- | src/nix-env/user-env.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index bb6df32d0..5e171d0a0 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -166,7 +166,7 @@ static void loadDerivations(EvalState & state, Path nixExprPath, Value v; findAlongAttrPath(state, pathPrefix, autoArgs, loadSourceExpr(state, nixExprPath), v); - getDerivations(state, v, pathPrefix, autoArgs, elems); + getDerivations(state, v, pathPrefix, autoArgs, elems, true); /* Filter out all derivations not applicable to the current system. */ @@ -362,7 +362,7 @@ static void queryInstSources(EvalState & state, Expr * e2 = state.parseExprFromString(*i, absPath(".")); Expr * call = new ExprApp(e2, e1); Value v; state.eval(call, v); - getDerivations(state, v, "", instSource.autoArgs, elems); + getDerivations(state, v, "", instSource.autoArgs, elems, true); } break; @@ -417,7 +417,7 @@ static void queryInstSources(EvalState & state, Value v; findAlongAttrPath(state, *i, instSource.autoArgs, loadSourceExpr(state, instSource.nixExprPath), v); - getDerivations(state, v, "", instSource.autoArgs, elems); + getDerivations(state, v, "", instSource.autoArgs, elems, true); } break; } diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index d7de17901..5b754bc8c 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -25,7 +25,7 @@ DrvInfos queryInstalled(EvalState & state, const Path & userEnv) Value v; state.evalFile(manifestFile, v); Bindings bindings; - getDerivations(state, v, "", bindings, elems); + getDerivations(state, v, "", bindings, elems, false); } else if (pathExists(oldManifestFile)) readLegacyManifest(oldManifestFile, elems); @@ -127,7 +127,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, /* Evaluate it. */ debug("evaluating user environment builder"); DrvInfo topLevelDrv; - if (!getDerivation(state, topLevel, topLevelDrv)) + if (!getDerivation(state, topLevel, topLevelDrv, false)) abort(); /* Realise the resulting store expression. */ |