git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122852 from mweinelt/batman-advb

batman-adv: fix build on linux>=5.12

commit460d4a40a0765b888a6d61597ffd114f4150197e authorMartin Weinelt <mweinelt@users.noreply.github.com> dateThu 13 May 2021, 20:16 (6 years ago) parentf044205d5bda9e
1 file changed+9−1
pkgs/os-specific/linux/batman-adv/default.nix+9−1
pkgs/os-specific/linux/batman-adv/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, kernel }:
1+{ lib, stdenv, fetchurl, fetchpatch, kernel }:
22
33let cfg = import ./version.nix; in
44
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
1111 sha256 = cfg.sha256.${pname};
1212 };
1313
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+ ];
21+
1422 nativeBuildInputs = kernel.moduleBuildDependencies;
1523
1624 hardeningDisable = [ "pic" ];