diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-12-30 16:09:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 16:09:42 +0100 |
| commit | c3af87f879917a0f62c7cd25025dea6eb3a81f3f (patch) | |
| tree | 951476700c138d9f56becb00ef6e70d5910356d3 /pkgs/os-specific/linux | |
| parent | 19031b4931bfca8e7d1135f043282895315dfc86 (diff) | |
| parent | 703e8c433ebe0aecd511be7800832713a4c20675 (diff) | |
| download | nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar.gz nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar.bz2 nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar.lz nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar.xz nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.tar.zst nixlib-c3af87f879917a0f62c7cd25025dea6eb3a81f3f.zip | |
Merge pull request #277369 from herbetom/fix-batman-adv-skb_vlan_eth_hdr
batman-adv: fix redefinition of skb_vlan_eth_hdr
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4300d576b8d9..ac1e1f8038dd 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, fetchpatch +, fetchpatch2 , kernel }: @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + # batman-adv: compat: Fix skb_vlan_eth_hdr conflict in stable kernels + (fetchpatch2 { + url = "https://git.open-mesh.org/batman-adv.git/commitdiff_plain/be69e50e8c249ced085d41ddd308016c1c692174?hp=74d3c5e1c682a9efe31b75e8986668081a4b5341"; + sha256 = "sha256-yfEiU74wuMSKal/6mwzgdccqDMEv4P7CkAeiSAEwvjA="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" |