Inline

IntersectMBO · Aug 8, 2022 · 90abe48 · 90abe48
1 parent e9f630e
commit 90abe48
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/nix/workbench/default.nix b/nix/workbench/default.nix
@@ -104,10 +104,7 @@ let
       profileNix = ps.value."${profileName}"
         or (throw "No such profile: ${profileName};  Known profiles: ${toString (__attrNames ps.value)}");
 
-      profile = materialise-profile
-        { inherit profileNix;
-          backendProfile = backend.materialise-profile { inherit profileNix; };
-        };
+      profile = materialise-profile { inherit profileNix backend; };
 
       topology = profile-topology { inherit profileNix profile; };
 

diff --git a/nix/workbench/profile.nix b/nix/workbench/profile.nix
@@ -2,10 +2,11 @@
 with lib;
 
 { profileNix
-, backendProfile ## Backend-specific results for forwarding
+, backend ## Backend-specifics for forwarding
 }:
 pkgs.runCommand "workbench-profile-output-${profileNix.name}"
   { buildInputs = [];
+    backendConfigPath = backend.materialise-profile { inherit profileNix; };
     nodeServices =
       __toJSON
       (flip mapAttrs profileNix.node-services
@@ -40,7 +41,7 @@ pkgs.runCommand "workbench-profile-output-${profileNix.name}"
   mkdir $out
   cp    ${profileNix.JSON}            $out/profile.json
   cp    ${profileNix.node-specs.JSON} $out/node-specs.json
-  cp    ${backendProfile}/*           $out
+  cp    $backendConfigPath/*          $out
   cp    $nodeServicesPath             $out/node-services.json
   cp    $generatorServicePath         $out/generator-service.json
   cp    $tracerServicePath            $out/tracer-service.json