diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-01-29 19:06:45 +0100 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-02-08 15:16:40 +0000 |
| commit | 31fa2cd52bef42d670c569cb8951509c89c143b0 (patch) | |
| tree | c96d537b413df3e9bee2008c94b2106e6a9ba6a0 | |
| parent | 12315a278ce555ff48ceef432501f59f164568f1 (diff) | |
| download | nixlib-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
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.13.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 8 insertions, 4 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 {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57a1933c7b26..c6f8fe8b8dda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6660,13 +6660,17 @@ let # config options you need (e.g. by overriding extraConfig). See list of options here: # https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: { - modDirVersion = "${linux_3_2.version}-grsec"; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_2_54 kernelPatches.grsec_path ]; + argsOverride = { + modDirVersion = "${linux_3_2.modDirVersion}-grsec"; + }; })) (args: grsecurityOverrider args)); linux_3_12_grsecurity = lowPrio (lib.overrideDerivation (linux_3_12.override (args: { - modDirVersion = "${linux_3_12.version}-grsec"; kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_3_0_3_12_8 kernelPatches.grsec_path ]; + argsOverride = { + modDirVersion = "${linux_3_12.modDirVersion}-grsec"; + }; })) (args: grsecurityOverrider args)); linux_3_2_apparmor = lowPrio (linux_3_2.override { |