diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 22:36:50 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-09-30 22:41:53 +0000 |
| commit | f4f3203aa7c2fc9225a8ae220db25593066fb397 (patch) | |
| tree | 9063673af148e34069dd894a2fd6a2981b13ff26 /src/nix-env/user-env.cc | |
| parent | 1b6cf0d5f56e166a1cbbf38142375b7a92fc88f2 (diff) | |
| parent | 6a8d6246f603a372d557ab026670ae42bad558b0 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
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 5ceb2ae67..1fd4bcbd3 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -131,9 +131,9 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, state.forceValue(topLevel); PathSet context; Attr & aDrvPath(*topLevel.attrs->find(state.sDrvPath)); - auto topLevelDrv = state.store->parseStorePath(state.coerceToPath(aDrvPath.pos ? *(aDrvPath.pos) : noPos, *(aDrvPath.value), context)); + auto topLevelDrv = state.store->parseStorePath(state.coerceToPath(*aDrvPath.pos, *aDrvPath.value, context)); Attr & aOutPath(*topLevel.attrs->find(state.sOutPath)); - Path topLevelOut = state.coerceToPath(aOutPath.pos ? *(aOutPath.pos) : noPos, *(aOutPath.value), context); + Path topLevelOut = state.coerceToPath(*aOutPath.pos, *aOutPath.value, context); /* Realise the resulting store expression. */ debug("building user environment"); |