fix(rust-crane): override cargo in config.deps with our toolchain so …

…that rust-cargo-vendor uses it too
nix-community · Nov 12, 2024 · f4dc2db · f4dc2db
1 parent 87bc465
commit f4dc2db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/modules/dream2nix/rust-cargo-vendor/default.nix b/modules/dream2nix/rust-cargo-vendor/default.nix
@@ -98,6 +98,7 @@ in {
     l.mapAttrs (_: l.mkOverride 998) {
       inherit
         (nixpkgs)
+        cargo
         jq
         moreutils
         python3Packages

diff --git a/modules/dream2nix/rust-crane/default.nix b/modules/dream2nix/rust-crane/default.nix
@@ -133,6 +133,10 @@ in {
 
   deps = {nixpkgs, ...}:
     l.mkMerge [
+      {
+        # override cargo package to be the rust toolchain so that rust-cargo-vendor uses the custom provided toolchain if any
+        cargo = l.mkOverride 1001 rustToolchain;
+      }
       (l.mapAttrs (_: l.mkDefault) {
         craneSource = config.deps.fetchFromGitHub {
           owner = "ipetkov";