colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #277369 from herbetom/fix-batman-adv-skb_vlan_eth_hdr

Browse Source 
batman-adv: fix redefinition of skb_vlan_eth_hdr
This commit is contained in:
Martin Weinelt 2023-12-30 16:09:42 +01:00 committed by GitHub
commit c3af87f879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/batman-adv/default.nix
View File

@ -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"