From 8b303e62b9c6ead5b666e68c326e2ebfa177f3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Tue, 4 Mar 2025 15:37:19 +0100
Subject: [PATCH] Also wrap rustc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 lib/mk-dylint.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/mk-dylint.nix b/lib/mk-dylint.nix
index 595b4db..7b97b81 100644
--- a/lib/mk-dylint.nix
+++ b/lib/mk-dylint.nix
@@ -49,6 +49,18 @@ let
       ;;
     esac
   '';
+  rustc-wrapper = pkgs.writeShellScriptBin "rustc" ''
+    case "$RUSTUP_TOOLCHAIN" in
+    ${lib.strings.concatMapAttrsStringSep "\n" (name: _: ''
+      ${name})
+        exec ${toolchains.${name}}/bin/rustc "$@"
+      ;;
+    '') driverMap}
+      *)
+        exec ${craneLib.rustc}/bin/rustc "$@"
+      ;;
+    esac
+  '';
 in
 pkgs.runCommandLocal "cargo-dylint-wrapped"
   {
@@ -66,7 +78,12 @@ pkgs.runCommandLocal "cargo-dylint-wrapped"
         lib.strings.makeLibraryPath (builtins.map (v: v.package) lints)
       }" \
       --set DYLINT_DRIVER_PATH ${drivers} \
-      --prefix PATH : ${lib.makeBinPath [ cargo-wrapper ]}
+      --prefix PATH : ${
+        lib.makeBinPath [
+          cargo-wrapper
+          rustc-wrapper
+        ]
+      }
 
     ln -s ${cargo-dylint}/bin/dylint-link $out/bin/dylint-link
   ''