Merge pull request #122852 from mweinelt/batman-advb

batman-adv: fix build on linux>=5.12

authored by Martin Weinelt and committed by GitHub 460d4a40 f0442057

+9 -1
+9 -1
pkgs/os-specific/linux/batman-adv/default.nix
··· 1 - { lib, stdenv, fetchurl, kernel }: 1 + { lib, stdenv, fetchurl, fetchpatch, kernel }: 2 2 3 3 let cfg = import ./version.nix; in 4 4 ··· 10 10 url = "http://downloads.open-mesh.org/batman/releases/${pname}-${cfg.version}/${pname}-${cfg.version}.tar.gz"; 11 11 sha256 = cfg.sha256.${pname}; 12 12 }; 13 + 14 + patches = [ 15 + (fetchpatch { 16 + # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1 17 + url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d"; 18 + sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg"; 19 + }) 20 + ]; 13 21 14 22 nativeBuildInputs = kernel.moduleBuildDependencies; 15 23