Replace rust-wrapper with RUSTC_FORCE_RUSTC_VERSION

Requires rust-lang/rust#124339 but drastically simplifies evading nightly-detection
Nemo157 · May 2, 2024 · 2dfc163 · 2dfc163
1 parent 2dfdb66
commit 2dfc163
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/shells/rust/default.nix b/shells/rust/default.nix
@@ -1,6 +1,5 @@
 { pkgs, lib, ... }:
 let
-  wrap-rust = pkgs.callPackage ./wrap-rust.nix {};
   setup-xdg-cargo-home = pkgs.writeShellApplication {
     name = "setup-xdg-cargo-home";
     text = lib.readFile ./setup-xdg-cargo-home;
@@ -40,10 +39,12 @@ in {
     }
   )),
   custom ? true,
-}: pkgs.mkShell {
+}: let
+  version = lib.lists.head (lib.strings.split "-" rust-toolchain.version);
+in pkgs.mkShell {
   buildInputs = with pkgs; [
     # Rust itself
-    (if custom then (wrap-rust rust-toolchain) else rust-toolchain)
+    rust-toolchain
 
     # Dev utilities
     bacon
@@ -130,5 +131,6 @@ in {
 
     # Some crates disable nightly feature detection when this is set
     export RUSTC_STAGE=1
+    export RUSTC_FORCE_RUSTC_VERSION=${version}
   '' else "");
 }
diff --git a/shells/rust/wrap-rust.nix b/shells/rust/wrap-rust.nix