nix: Add convenience override functions

Signed-off-by: Nick Spinale <nick@nickspinale.com>
seL4 · Jun 26, 2024 · 54f758e · 54f758e
1 parent 21bd721
commit 54f758e
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/hacking/nix/default.nix b/hacking/nix/default.nix
@@ -171,7 +171,21 @@ let
         inherit lib pkgs;
       } // import ./top-level self);
 
-  this = makeOverridableWith lib.id mkThis baseArgs;
+  this = lib.fix (self: makeOverridableWith lib.id mkThis baseArgs // rec {
+    overrideNixpkgsArgs = f: self.override (superArgs: selfBase:
+      let
+        concreteSuperArgs = superArgs selfBase;
+      in
+        concreteSuperArgs // {
+          nixpkgsArgsFor = crossSystem: f (concreteSuperArgs.nixpkgsArgsFor crossSystem);
+        }
+    );
+    withOverlays = overlays: self.overrideNixpkgsArgs (superNixpkgsArgs:
+      superNixpkgsArgs // {
+        overlays = superNixpkgsArgs.overlays ++ overlays;
+      }
+    );
+  });
 
 in
   this