Merge remote-tracking branch 'upstream/master' into path-info

1 files changed, 6 insertions, 1 deletions

diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
index 05723f656..7a88b4acc 100644
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -200,12 +200,17 @@ void Input::markChangedFile(
     return scheme->markChangedFile(*this, file, commitMsg);
 }
 
+std::string Input::getName() const
+{
+    return maybeGetStrAttr(attrs, "name").value_or("source");
+}
+
 StorePath Input::computeStorePath(Store & store) const
 {
     auto narHash = getNarHash();
     if (!narHash)
         throw Error("cannot compute store path for mutable input '%s'", to_string());
-    return store.makeFixedOutputPath("source", FixedOutputInfo {
+    return store.makeFixedOutputPath(getName(), FixedOutputInfo {
         {
             .method = FileIngestionMethod::Recursive,
             .hash = *narHash,