Merge remote-tracking branch 'origin/master' into flakes

2020-07-14 13:56:18 +02:00
parent 9223603908 926c3a6664
commit 832e111494
41 changed files with 574 additions and 382 deletions
@@ -381,7 +381,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)

            if (store->isInStore(r.second)) {
                StorePathSet closure;
-                store->computeFSClosure(store->parseStorePath(store->toStorePath(r.second)), closure);
+                store->computeFSClosure(store->toStorePath(r.second).first, closure);
                for (auto & path : closure)
                    allowedPaths->insert(store->printStorePath(path));
            } else