From e52446bcacf7a6246be055a0970a106831b5a1ce Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 30 Sep 2024 20:41:47 +0300 Subject: [PATCH] linux/common-config: begin carcinization We now have a compatible rustc to build 6.12 with, which means THE TIME HAS COME PRAISE THE CRAB --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0b3da3f22f71..e7c212cb6e6f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -32,8 +32,11 @@ let forceRust = features.rust or false; kernelSupportsRust = lib.versionAtLeast version "6.7"; - # Currently not enabling Rust by default, as upstream requires rustc 1.81 - defaultRust = false; + # Currently only enabling Rust by default on kernel 6.12+, + # which actually has features that use Rust that we want, + # and only on x86_64, because of a nixpkgs rustc issue: + # https://github.com/NixOS/nixpkgs/pull/315121#issuecomment-2135805876 + defaultRust = lib.versionAtLeast version "6.12" && stdenv.hostPlatform.isx86_64; withRust = (forceRust || defaultRust) && kernelSupportsRust; options = {