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

Revert "Use template structs instead of phantoms"

Browse source 
This reverts commit 9ab07e99f5.
This commit is contained in:
John Ericson 2020-09-30 00:39:06 +00:00
parent e9fc2031f0
commit 45a0ed82f0
8 changed files with 153 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/derivations.cc
View file

@ -584,7 +584,7 @@ Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv,
drv.outputs.emplace(std::move(name), std::move(output));
}
drv.inputSrcs = WorkerProto<StorePathSet>::read(store, in);
drv.inputSrcs = nix::worker_proto::read(store, in, Phantom<StorePathSet> {});
in >> drv.platform >> drv.builder;
drv.args = readStrings<Strings>(in);
@ -622,7 +622,7 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
},
}, i.second.output);
}
WorkerProto<StorePathSet>::write(store, out, drv.inputSrcs);
nix::worker_proto::write(store, out, drv.inputSrcs);
out << drv.platform << drv.builder << drv.args;
out << drv.env.size();
for (auto & i : drv.env)