diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-04T19·22-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-04T19·22-0400 |
| commit | 70f75be199d8db959d313dc40111893fba56415f (patch) | |
| tree | f099812cc963ba6e1235a3cea95b32a0a83c0f47 /src/nix-env/user-env.cc | |
| parent | ad328bea15e2708e5aa784c33ba8bfbc86d02e0d (diff) | |
getDerivation(): Don't always quietly ignore assertion failure
Ignoring assertion failures makes some sense for nix-env -qa, but not for nix-instantiate/nix-build or hydra-eval-jobs.
Diffstat (limited to 'src/nix-env/user-env.cc')
| -rw-r--r-- | src/nix-env/user-env.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index d7de179010..5b754bc8ca 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. */ |