nix: Add name parameter to buildCratesInLayers

Signed-off-by: Nick Spinale <nick@nickspinale.com>
seL4 · May 29, 2024 · b1334ac · b1334ac
1 parent 181b523
commit b1334ac
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/hacking/nix/rust-utils/build-crates-in-layers.nix b/hacking/nix/rust-utils/build-crates-in-layers.nix
@@ -32,6 +32,9 @@ in
 , rustEnvironment ? defaultRustEnvironment
 , targetTriple ? defaultRustTargetTriple
 
+
+, name ? if rootCrate != null then rootCrate.name else "build-crates"
+
 , rootCrate ? null
 , rootCrates ? if rootCrate != null then [ rootCrate ] else throw "must supply 'rootCrates' argument"
 
@@ -106,8 +109,6 @@ let
 
   lastIntermediateLayer = f (lib.reverseList accumulatedLayers);
 
-  buildName = if rootCrate != null then rootCrate.name else "build-crates";
-
   baseArgs = {
     depsBuildBuild = [ buildPackages.stdenv.cc ];
     nativeBuildInputs = [ rustEnvironment.rustToolchain ] ++ lib.optionals verifyWithVerus [ verus ];
@@ -214,7 +215,7 @@ let
         runClippyThisLayer = runClippy && layer.reals != {};
       in
         modifications.modifyDerivation (stdenv.mkDerivation (baseArgs // {
-          name = "${buildName}-intermediate";
+          name = "${name}-intermediate";
 
           phases = [ "buildPhase" ];
 
@@ -259,7 +260,7 @@ in let
   ];
 
   final = modifications.modifyDerivation (stdenv.mkDerivation (baseArgs // {
-    name = buildName;
+    name = name;
 
     phases = [ "buildPhase" ];