feat(zkvmLib): Add the ability to override dependencies

Allows you to add `overrideVendorCargoPackage` and
`overrideVendorGitCheckout` to args, which allow the overriding of
vendored dependencies, as is implemented in crane.lib.

The respective attribute must be added to commonArgs (i.e. to both
`buildDepsOnly` and `buildPackage` args).

1 files changed, 15 insertions, 5 deletions

diff --git a/zkvmLib.nix b/zkvmLib.nix
index bc7010b..cd92d5a 100644
--- a/zkvmLib.nix
+++ b/zkvmLib.nix
@@ -76,14 +76,24 @@ pkgs: guest: let
         '';
       };
 
-    cargoVendorDir = craneLib.vendorCargoDeps {
-      src = cargoLockDrv;
-    };
+    cargoVendorDir = craneLib.vendorCargoDeps ({
+          src = cargoLockDrv;
+        } // (
+        if args ? overrideVendorCargoPackage then
+          { inherit (args) overrideVendorCargoPackage; }
+        else
+          { })
+        // (
+        if args ? overrideVendorGitCheckout then
+          { inherit (args) overrideVendorGitCheckout; }
+        else
+          { }));
+
   };
 in {
   buildDepsOnly = craneLib: args: let
     cargoLocks = generateCargoLocks craneLib args;
-  in craneLib.buildDepsOnly (cargoLocks // args // {
+  in craneLib.buildDepsOnly (cargoLocks // (builtins.removeAttrs args ["overrideVendorCargoPackage" "overrideVendorGitCheckout"]) // {
       postUnpack = ''
         ${args.postUnpack or ""}
         ln -s ../../../guests ./source/zkvms/${args.pname}/guest/
@@ -193,5 +203,5 @@ in {
     '';
 
     doNotPostBuildInstallCargoBinaries = true;
-  } // args // { inherit pname; });
+  } // (builtins.removeAttrs args ["overrideVendorCargoPackage" "overrideVendorGitCheckout"]) // { inherit pname; });
 }