Commit 5d6c7f9e authored by NullCube's avatar NullCube Committed by Alyssa Ross
Browse files

linuxPackages.broadcom_sta: 6.30.223.271(-56) -> 6.30.223.271-57 

Add patches from rpmfusion to fix build on kernel 6.15.
Add the release number from the rpmfusion repo to the package version in
order to better differentiate the various versions of the package.

Full changelog:
https://github.com/rpmfusion/wl-kmod/compare/9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2..b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957
parent 6530ed81

pkgs/os-specific/linux/broadcom-sta/default.nix

+11 −4
Original line number Diff line number Diff line
@@ -3,12 +3,15 @@ 
  stdenv,

  fetchurl,

  fetchFromGitHub,

  fetchpatch2,

  kernel,

}:



let

  version = "6.30.223.271";

  # Patchset release number from rpmfusion, to more easily differentiate

  # versions and updates. See `wl-kmod.spec` file:

  # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19

  release = "57";

  hashes = {

    i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0=";

    x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4=";
@@ -21,8 +24,8 @@ let 
  rpmFusionPatches = fetchFromGitHub {

    owner = "rpmfusion";

    repo = "wl-kmod";

    rev = "9a5a0d7195e0f6b05ff97e948b97fb0b7427cbf2";

    hash = "sha256-pOOkkOjc77KGqc9fWuRyRsymd90OpLEnbOvxBbeIdKQ=";

    rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957";

    hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4=";

  };

  patchset = [

    "wl-kmod-001_wext_workaround.patch"
@@ -55,10 +58,14 @@ let 
    "wl-kmod-028_kernel_6.12_adaptation.patch"

    "wl-kmod-029_kernel_6.13_adaptation.patch"

    "wl-kmod-030_kernel_6.14_adaptation.patch"

    "wl-kmod-031_replace_EXTRA_CFLAGS_EXTRA_LDFLAGS_with_ccflags-y_ldflags-y.patch"

    "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch"

    "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch"

    "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch"

  ];

in

stdenv.mkDerivation {

  name = "broadcom-sta-${version}-${kernel.version}";

  name = "broadcom-sta-${version}-${release}-${kernel.version}";



  src = fetchurl {

    url = "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/${tarball}";