diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2021-05-13 20:16:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 20:16:27 +0200 |
| commit | 460d4a40a0765b888a6d61597ffd114f4150197e (patch) | |
| tree | cebe36f8f7c3c5092be5bbe9b76b968f93012c04 | |
| parent | f0442057410fd2df06170faf95fa5c6de250debc (diff) | |
| parent | d5bda9ed61ae916b4511a63ce6ff2eedb14de387 (diff) | |
| download | nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar.gz nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar.bz2 nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar.lz nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar.xz nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.tar.zst nixpkgs-460d4a40a0765b888a6d61597ffd114f4150197e.zip | |
Merge pull request #122852 from mweinelt/batman-advb
batman-adv: fix build on linux>=5.12
| -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 354f4b1bff2..7da14593410 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, fetchpatch, kernel }: let cfg = import ./version.nix; in @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + (fetchpatch { + # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1 + url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d"; + sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg"; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; |