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

Merge pull request #122852 from mweinelt/batman-advb

Browse Source 
batman-adv: fix build on linux>=5.12
This commit is contained in:
Martin Weinelt 2021-05-13 20:16:27 +02:00 committed by GitHub
commit 460d4a40a0
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,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" ];