From 18a80ee43c6b16754ce49ef18b82db8777553181 Mon Sep 17 00:00:00 2001 From: Johannes Arnold Date: Tue, 26 Nov 2024 19:24:07 -0800 Subject: [PATCH] linuxPackages_latest.broadcom_sta: add patch to compile on Kernel 6.12 Commit 5f60d5f6bbc1, part of Kernel 6.12, moves asm/unaligned.h to linux/unaligned.h. As a result we use a trivial patch which simply switches the include path if compiling for 6.12. --- pkgs/os-specific/linux/broadcom-sta/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 7bf505f7fa94..9d310b02e179 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchFromGitHub, + fetchpatch2, kernel, }: @@ -66,7 +67,13 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - patches = map (patch: "${rpmFusionPatches}/${patch}") patchset; + patches = map (patch: "${rpmFusionPatches}/${patch}") patchset ++ [ + # Fix for Kernel 6.12 and later (5f60d5f6bbc1) + (fetchpatch2 { + url = "https://gist.githubusercontent.com/joanbm/20db669eed4d8367a457780747be8cb9/raw/5536ba1354b6b97013530e7345d3bf29e92225b1/broadcom-wl-fix-linux-6.12.patch"; + hash = "sha256-Y5VgWp0m5tNp8lxDhIg7IodbqyUsJVHHiVIFgP9ioHE="; + }) + ]; makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ];