From 51943fca6b95cb9649236bacf5d7c8d9af4c3bec Mon Sep 17 00:00:00 2001
From: dusk <y.bera003.06@protonmail.com>
Date: Mon, 4 Nov 2024 15:33:07 +0300
Subject: [PATCH] refactor(rust-crane): don't overlay the pkgs for crane, use
 the overrideToolchain api instead (#1069)

---
 modules/dream2nix/rust-crane/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/dream2nix/rust-crane/default.nix b/modules/dream2nix/rust-crane/default.nix
index 20d1b4e95..4305a8f67 100644
--- a/modules/dream2nix/rust-crane/default.nix
+++ b/modules/dream2nix/rust-crane/default.nix
@@ -77,15 +77,13 @@
       ;
   };
 
-  crane = import config.deps.craneSource {
-    pkgs = config.deps.cranePkgs.appendOverlays [
-      (
-        final: prev: {
-          cargo = config.deps.cargo;
-        }
-      )
-    ];
+  _crane = import config.deps.craneSource {
+    pkgs = config.deps.cranePkgs;
   };
+  crane =
+    if config.deps.mkRustToolchain != null
+    then _crane.overrideToolchain config.deps.mkRustToolchain
+    else _crane;
 
   vendoring = import ./vendor.nix {
     inherit dreamLock getSource lib;
@@ -209,7 +207,6 @@ in {
   deps = {nixpkgs, ...}:
     l.mkMerge [
       (l.mapAttrs (_: l.mkDefault) {
-        cargo = nixpkgs.cargo;
         craneSource = config.deps.fetchFromGitHub {
           owner = "ipetkov";
           repo = "crane";
@@ -217,6 +214,7 @@ in {
           sha256 = "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=";
         };
         cranePkgs = nixpkgs.pkgs;
+        mkRustToolchain = null;
       })
       # maybe it would be better to put these under `options.rust-crane.deps` instead of this `deps`
       # since it conflicts with a lot of stuff?