From 1abb38d2a5489a22b1126245650c14bca4eaf65a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 31 Jul 2025 09:22:19 +0200
Subject: [PATCH] linux: use consistent rustc and rust-bindgen

If we're going to use the unwrapped versions, we should do so
consistently in both parts of the kernel build, not mix and match.

Fixes: e9b2edb49163 ("linux: un-simplify toolchain selection")
---
 pkgs/os-specific/linux/kernel/generic.nix       | 2 +-
 pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 4936eb0f0526..047cff9b0081 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -190,7 +190,7 @@ let
         ]
         ++ lib.optional (lib.versionAtLeast version "5.2") pahole
         ++ lib.optionals withRust [
-          rust-bindgen
+          rust-bindgen.unwrapped
           rustc.unwrapped
         ];
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index e054ab30ab4e..8b33301ef6eb 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -169,7 +169,7 @@ lib.makeOverridable (
         ]
         ++ optional (lib.versionAtLeast version "5.13") zstd
         ++ optionals withRust [
-          rustc
+          rustc.unwrapped
           rust-bindgen.unwrapped
         ];
 
@@ -229,7 +229,7 @@ lib.makeOverridable (
           zlib
         ]
         ++ optionals withRust [
-          rustc
+          rustc.unwrapped
           rust-bindgen.unwrapped
         ];