fetchTree: Return a path instead of a store path

tomberek · Aug 22, 2024 · 2f84513 · 2f84513
1 parent fa49d2e
commit 2f84513
Showing 1 changed file with 32 additions and 5 deletions.
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
@@ -17,17 +17,17 @@
 
 namespace nix {
 
-void emitTreeAttrs(
+static void emitTreeAttrs(
     EvalState & state,
-    const StorePath & storePath,
     const fetchers::Input & input,
     Value & v,
+    std::function<void(Value &)> setOutPath,
     bool emptyRevFallback,
     bool forceDirty)
 {
     auto attrs = state.buildBindings(100);
 
-    state.mkStorePathString(storePath, attrs.alloc(state.sOutPath));
+    setOutPath(attrs.alloc(state.sOutPath));
 
     // FIXME: support arbitrary input attributes.
 
@@ -72,10 +72,27 @@ void emitTreeAttrs(
     v.mkAttrs(attrs);
 }
 
+void emitTreeAttrs(
+    EvalState & state,
+    const StorePath & storePath,
+    const fetchers::Input & input,
+    Value & v,
+    bool emptyRevFallback,
+    bool forceDirty)
+{
+    emitTreeAttrs(state, input, v,
+        [&](Value & vOutPath) {
+            state.mkStorePathString(storePath, vOutPath);
+        },
+        emptyRevFallback,
+        forceDirty);
+}
+
 struct FetchTreeParams {
     bool emptyRevFallback = false;
     bool allowNameArgument = false;
     bool isFetchGit = false;
+    bool returnPath = true; // whether to return a SourcePath or a StorePath
 };
 
 static void fetchTree(
@@ -112,7 +129,9 @@ static void fetchTree(
 
         for (auto & attr : *args[0]->attrs()) {
             if (attr.name == state.sType) continue;
+
             state.forceValue(*attr.value, attr.pos);
+
             if (attr.value->type() == nPath || attr.value->type() == nString) {
                 auto s = state.coerceToString(attr.pos, *attr.value, context, "", false, false).toOwned();
                 attrs.emplace(state.symbols[attr.name],
@@ -197,7 +216,14 @@ static void fetchTree(
 
     state.allowPath(storePath);
 
-    emitTreeAttrs(state, storePath, input2, v, params.emptyRevFallback, false);
+    emitTreeAttrs(state, input2, v,
+        [&](Value & vOutPath) {
+            if (params.returnPath)
+                vOutPath.mkPath(state.rootPath(state.store->toRealPath(storePath)));
+            else
+                state.mkStorePathString(storePath, vOutPath);
+        },
+        params.emptyRevFallback, false);
 }
 
 static void prim_fetchTree(EvalState & state, const PosIdx pos, Value * * args, Value & v)
@@ -614,7 +640,8 @@ static void prim_fetchGit(EvalState & state, const PosIdx pos, Value * * args, V
         FetchTreeParams {
             .emptyRevFallback = true,
             .allowNameArgument = true,
-            .isFetchGit = true
+            .isFetchGit = true,
+            .returnPath = false,
         });
 }