lib/mk-dylint.nix

@@ -26,38 +26,12 @@ let
       ln -s ${driver}/bin/dylint_driver-nix $out/${name}/dylint-driver
     '') driverMap}
   '';
-  cargo-wrapper = pkgs.writeShellScriptBin "cargo" ''
-    case "$RUSTUP_TOOLCHAIN" in
-    ${lib.strings.concatMapAttrsStringSep "\n" (
-      name: driver:
-      let
-        toolchain =
-          (pkgs.rust-bin.fromRustupToolchainFile (pkgs.writeText "${name}-toolchain.toml" name)).override
-            {
-              extensions = [
-                "rustc-dev"
-              ];
-            };
-
-      in
-      ''
-        ${name})
-          exec ${toolchain}/bin/cargo "$@"
-        ;;
-      ''
-    ) driverMap}
-      *)
-        exec cargo "$@"
-      ;;
-    esac
-  '';
 in
 pkgs.runCommandLocal "cargo-dylint-wrapped"
   {
     nativeBuildInputs = [ pkgs.makeWrapper ];
     meta.mainProgram = "cargo-dylint";
     passthru = {
-      inherit lints;
       DYLINT_LIBRARY_PATH = lib.strings.makeLibraryPath (builtins.map (v: v.package) lints);
       DYLINT_DRIVER_PATH = drivers;
     };
@@ -67,8 +41,7 @@ pkgs.runCommandLocal "cargo-dylint-wrapped"
       --set-default DYLINT_LIBRARY_PATH "${
         lib.strings.makeLibraryPath (builtins.map (v: v.package) lints)
       }" \
-      --set DYLINT_DRIVER_PATH ${drivers} \
-      --prefix PATH : ${lib.makeBinPath [ cargo-wrapper ]}
+      --set DYLINT_DRIVER_PATH ${drivers};
 
     ln -s ${cargo-dylint}/bin/dylint-link $out/bin/dylint-link
   ''