diff options
author | Ricardo M. Correia <rcorreia@wizy.org> | 2014-01-21 01:46:44 +0100 |
---|---|---|
committer | Ricardo M. Correia <rcorreia@wizy.org> | 2014-01-22 02:14:35 +0100 |
commit | fd896d09fa385481ee08cb5cf171890f624a548e (patch) | |
tree | d85cf53ec76cc2e6f91ef3186fd1f7e86a9ecc62 /pkgs/top-level | |
parent | c373a49b10c8f854adcbf895916a9b53d33b8db7 (diff) | |
download | nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar.gz nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar.bz2 nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar.lz nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar.xz nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.tar.zst nixlib-fd896d09fa385481ee08cb5cf171890f624a548e.zip |
grsecurity: Fix build under new generic kernel derivation
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1ab8ef3f9d7..6877a71fe2d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6557,11 +6557,6 @@ let }; grsecurityOverrider = args: { - # Install gcc plugins. These are needed for compiling dependant packages. - postInstall = '' - ${args.postInstall or ""} - cp "tools/gcc/"*.so $out/lib/modules/$version/build/tools/gcc/ - ''; # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins) # include libgmp headers, so we need these extra tweaks buildInputs = args.buildInputs ++ [ gmp ]; @@ -6577,10 +6572,12 @@ 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_53 kernelPatches.grsec_path ]; })) (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_2 kernelPatches.grsec_path ]; })) (args: grsecurityOverrider args)); |