From c394a61aa047867896f9c762aad894694eb197cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Tue, 4 Mar 2025 11:08:21 +0100
Subject: [PATCH] Directly use the toolchain as given
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously we hardcoded the nightly chain. This might not be true in the
future!

Signed-off-by: Marcel Müller <neikos@neikos.email>
---
 lib/mk-cargo-dylint-driver.nix | 13 ++++++++++++-
 lib/mk-dylint.nix              |  7 -------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/mk-cargo-dylint-driver.nix b/lib/mk-cargo-dylint-driver.nix
index 2286a99..face965 100644
--- a/lib/mk-cargo-dylint-driver.nix
+++ b/lib/mk-cargo-dylint-driver.nix
@@ -1,13 +1,24 @@
 {
+  pkgs,
   craneLib,
 }:
 
-toolchainName: toolchain:
+toolchainName:
 
 let
   pname = "cargo-dylint-driver-${toolchainName}";
   version = "4.0.0";
   src = ../dylint_driver;
+  toolchain =
+    (pkgs.rust-bin.fromRustupToolchainFile (
+      pkgs.writeText "${toolchainName}-toolchain.toml" toolchainName
+    )).override
+      {
+        extensions = [
+          "rustc-dev"
+        ];
+      };
+
 in
 
 (craneLib.overrideToolchain toolchain).buildPackage ({
diff --git a/lib/mk-dylint.nix b/lib/mk-dylint.nix
index da6c62b..aa70012 100644
--- a/lib/mk-dylint.nix
+++ b/lib/mk-dylint.nix
@@ -17,13 +17,6 @@ let
       "Rust toolchains generally do not start with numbers. Make sure you include the channel, as in `nightly-YYYY-MM-DD`. Given '${name}'"
       mkCargoDylintDriver
       "${name}"
-      (
-        pkgs.rust-bin.nightly."${lib.removePrefix "nightly-" name}".default.override {
-          extensions = [
-            "rustc-dev"
-          ];
-        }
-      )
   ) driver_names;
   drivers = pkgs.runCommandLocal "dylint-drivers" { } ''
     mkdir -p $out