wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 19:03:16 +02:00
Code Activity

Checkpoint

Browse source
This commit is contained in:
Eelco Dolstra 2022-03-01 19:08:20 +01:00
parent 00b0fb27c1
commit 06c1edf889
18 changed files with 134 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/primops/fetchTree.cc
View file

@ -30,7 +30,7 @@ void emitTreeAttrs(
attrs.alloc(state.sOutPath).mkString(storePath, {storePath});
#endif
attrs.alloc(state.sOutPath).mkPath(state.packPath(path));
attrs.alloc(state.sOutPath).mkPath(path);
// FIXME: support arbitrary input attributes.
@ -138,8 +138,8 @@ static void fetchTree(
for (auto elem : attr.value->listItems()) {
// FIXME: use realisePath
PathSet context;
auto patchFile = state.unpackPath(state.coerceToPath(pos, *elem, context));
patches.push_back(patchFile.accessor->readFile(patchFile.path));
auto patchFile = state.coerceToPath(pos, *elem, context);
patches.push_back(patchFile.readFile());
}
continue;
@ -201,7 +201,7 @@ static void fetchTree(
emitTreeAttrs(
state,
{accessor, "/"},
{state.registerAccessor(accessor), "/"},
input2,
v,
params.emptyRevFallback,