summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2014-01-29 19:06:45 +0100
committerRicardo M. Correia <rcorreia@wizy.org>2014-02-08 15:16:40 +0000
commit31fa2cd52bef42d670c569cb8951509c89c143b0 (patch)
treec96d537b413df3e9bee2008c94b2106e6a9ba6a0 /pkgs/os-specific/linux/kernel
parent12315a278ce555ff48ceef432501f59f164568f1 (diff)
downloadnixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar.gz
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar.bz2
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar.lz
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar.xz
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.tar.zst
nixlib-31fa2cd52bef42d670c569cb8951509c89c143b0.zip
grsecurity: Fix building grsec-3.x.0 kernels
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.13.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.2.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index 637d2935c98f..a5d816b25633 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -13,4 +13,4 @@ import ./generic.nix (args // rec {
   features.needsCifsUtils = true;
   features.canDisableNetfilterConntrackHelpers = true;
   features.netfilterRPFilter = true;
-})
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index d7598b53b1bf..c0006ed73480 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -9,4 +9,4 @@ import ./generic.nix (args // rec {
   };
 
   features.iwlwifi = true;
-})
+} // (args.argsOverride or {}))