diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libexpr/primops/fetchTree.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index cb929b99a..9c2da2178 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -237,13 +237,14 @@ static void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v, ? state.store->makeFixedOutputPath(FileIngestionMethod::Recursive, *expectedHash, name, {}) : state.store->makeFixedOutputPath(FileIngestionMethod::Flat, *expectedHash, name, {}); - auto validPaths = state.store->queryValidPaths({expectedPath}, NoSubstitute); - if (!validPaths.empty()) { + if (state.store->isValidPath(expectedPath)) { state.allowAndSetStorePathString(expectedPath, v); return; } } + // TODO: fetching may fail, yet the path may be substitutable. + // https://github.com/NixOS/nix/issues/4313 auto storePath = unpack ? fetchers::downloadTarball(state.store, *url, name, (bool) expectedHash).first.storePath |