diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
| commit | b74793bd1c458fec6e2dfc57d83ca1f33ac0f736 (patch) | |
| tree | 3a55306c8908eeecb78dedffe07bfd3e17693730 /pkgs/os-specific/linux/batman-adv | |
| parent | f3c994ca11ecfdf1966a143abe7a5007cc1c84e7 (diff) | |
| parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
| download | nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.gz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.bz2 nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.lz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.xz nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.zst nixpkgs-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/tools/system/facter/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/batman-adv')
| -rw-r--r-- | pkgs/os-specific/linux/batman-adv/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 627cb8794af..65fcd07a6e0 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; platforms = with stdenv.lib.platforms; linux; + broken = (kernel.features.grsecurity or false); }; } |