From 520a91a22e7e722b57e72624f3f1f7d80243b2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=BCller?= <neikos@neikos.email>
Date: Tue, 4 Mar 2025 10:56:58 +0100
Subject: [PATCH] Strip prefix rather than prepending nightly
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   | 8 ++++----
 rust-toolchain.toml | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 rust-toolchain.toml

diff --git a/lib/mk-dylint.nix b/lib/mk-dylint.nix
index 06cbdb4..c13e9c7 100644
--- a/lib/mk-dylint.nix
+++ b/lib/mk-dylint.nix
@@ -13,8 +13,8 @@ let
   driver_names = lib.groupBy (v: v.toolchain) lints;
   driverMap = builtins.mapAttrs (
     name: _:
-    mkCargoDylintDriver "nightly-${name}" (
-      pkgs.rust-bin.nightly."${name}".default.override {
+    mkCargoDylintDriver "${name}" (
+      pkgs.rust-bin.nightly."${lib.removePrefix "nightly-" name}".default.override {
         extensions = [
           "rustc-dev"
         ];
@@ -25,8 +25,8 @@ let
     mkdir -p $out
 
     ${lib.strings.concatMapAttrsStringSep "\n" (name: driver: ''
-      mkdir -p $out/nightly-${name}
-      ln -s ${driver}/bin/dylint_driver-nix $out/nightly-${name}/dylint-driver
+      mkdir -p $out/${name}
+      ln -s ${driver}/bin/dylint_driver-nix $out/${name}/dylint-driver
     '') driverMap}
   '';
 in
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index 9b1b31a..0000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2025-03-01"
-components = ["rust-src", "rustc-dev", "llvm-tools-preview"]