Split shell & json creation for build environments with structured attrs

1 files changed, 8 insertions, 5 deletions

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 9bd7869f9..4e4f27458 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -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;