nix: Expose overridesForMkCrate

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Jun 26, 2024 · 7ea9573 · 7ea9573
1 parent 54f758e
commit 7ea9573
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/hacking/nix/scope/crates.nix b/hacking/nix/scope/crates.nix
@@ -19,7 +19,7 @@ let
 
   globalPatchSection = workspaceManifest.patch;
 
-  overrides = {
+  overridesForMkCrate = {
     sel4-sys = {
       extraPaths = [
         "build"
@@ -59,13 +59,11 @@ let
   };
 
   unAugmentedCrates = lib.listToAttrs (lib.forEach workspaceMemberPaths (cratePath: rec {
-    name = (crateUtils.crateManifest cratePath).package.name; # TODO redundant
-    value = crateUtils.mkCrate cratePath (overrides.${name} or {});
+    name = (crateUtils.crateManifest cratePath).package.name;
+    value = crateUtils.mkCrate cratePath (overridesForMkCrate.${name} or {});
   }));
 
-  augmentedCrates = crateUtils.augmentCrates unAugmentedCrates;
-
-  crates = augmentedCrates;
+  crates = crateUtils.augmentCrates unAugmentedCrates;
 
   isPrivate = crateName: builtins.match "^sel4-.*" crateName == null;
 
@@ -75,5 +73,5 @@ let
     (lib.concatMapStrings (crateName: "${crateName}\n") (lib.attrNames publicCrates));
 
 in {
-  inherit crates globalPatchSection publicCrates publicCratesTxt;
+  inherit crates overridesForMkCrate globalPatchSection publicCrates publicCratesTxt;
 }
diff --git a/hacking/nix/scope/default.nix b/hacking/nix/scope/default.nix
@@ -160,7 +160,8 @@ superCallPackage ../rust-utils {} self //
             { name = fname; path = builtins.toFile fname (builtins.readFile "${dir}/${fname}"); }
           ];
 
-  inherit (callPackage ./crates.nix {}) crates globalPatchSection publicCrates publicCratesTxt;
+  inherit (callPackage ./crates.nix {})
+    crates overridesForMkCrate globalPatchSection publicCrates publicCratesTxt;
 
   distribution = callPackage ./distribution.nix {};