summary refs log tree commit diff
path: root/pkgs/os-specific/linux/batman-adv
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2021-05-13 18:19:32 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2021-05-13 18:19:32 +0200
commitd5bda9ed61ae916b4511a63ce6ff2eedb14de387 (patch)
tree0831518c130acc78b022c6e496372967c3bcb997 /pkgs/os-specific/linux/batman-adv
parent4d8d99710540d1123ed398745d7b7d8d95c8b9d2 (diff)
downloadnixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar.gz
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar.bz2
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar.lz
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar.xz
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.tar.zst
nixpkgs-d5bda9ed61ae916b4511a63ce6ff2eedb14de387.zip
batman-adv: fix build on linux>=5.12
Diffstat (limited to 'pkgs/os-specific/linux/batman-adv')
-rw-r--r--pkgs/os-specific/linux/batman-adv/default.nix10
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" ];