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

Split shell & json creation for build environments with structured attrs

Browse source
This commit is contained in:
Maximilian Bosch 2021-05-13 16:11:56 +02:00
parent 447928bdb5
commit f1e281c4fe
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/nix-build/nix-build.cc
View file

@ -444,13 +444,16 @@ static void main_nix_build(int argc, char * * argv)
drv
);
if (auto structAttrs = parsedDrv.generateStructuredAttrs(std::nullopt, *store, inputs)) {
auto val = structAttrs.value();
structuredAttrsRC = val.first;
if (auto structAttrs = parsedDrv.prepareStructuredAttrs(std::nullopt, *store, inputs)) {
auto json = structAttrs.value();
structuredAttrsRC = parsedDrv.writeStructuredAttrsShell(json);
auto attrsJSON = (Path) tmpDir + "/.attrs.json";
writeFile(attrsJSON, val.second.dump());
writeFile(attrsJSON, json.dump());
auto attrsSH = (Path) tmpDir + "/.attrs.sh";
writeFile(attrsSH, val.first);
writeFile(attrsSH, structuredAttrsRC);
env["ATTRS_SH_FILE"] = attrsSH;
env["ATTRS_JSON_FILE"] = attrsJSON;
keepTmp = true;