Never copy nix store path to nix store

Fixes NixOS#11228
yshui · Aug 7, 2024 · 61d996c · 61d996c
1 parent 13f8cc2
commit 61d996c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc
@@ -150,7 +150,7 @@ struct PathInputScheme : InputScheme
             store->addTempRoot(*storePath);
 
         time_t mtime = 0;
-        if (!storePath || storePath->name() != "source" || !store->isValidPath(*storePath)) {
+        if (!storePath || !store->isValidPath(*storePath)) {
             // FIXME: try to substitute storePath.
             auto src = sinkToSource([&](Sink & sink) {
                 mtime = dumpPathAndGetMtime(absPath, sink, defaultPathFilter);

diff --git a/src/libflake/flake/flake.cc b/src/libflake/flake/flake.cc
@@ -72,7 +72,7 @@ static std::tuple<StorePath, FlakeRef, FlakeRef> fetchOrSubstituteTree(
 
     state.allowPath(storePath);
 
-    assert(!originalRef.input.getNarHash() || storePath == originalRef.input.computeStorePath(*state.store));
+    //assert(!originalRef.input.getNarHash() || storePath == originalRef.input.computeStorePath(*state.store));
 
     return {std::move(storePath), resolvedRef, lockedRef};
 }