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

grsecurity: fix features.grsecurity

Browse Source 
Previously, features.grsecurity wasn't actually set due to a bug in the
grsec builder. We now rely on the generic kernel builder to set features
from kernelPatches.
This commit is contained in:
Joachim Fasting 2016-08-29 03:57:47 +02:00
parent b56f7acc78
commit e5c3a52afc
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/grsecurity/default.nix
View File

@ -20,8 +20,7 @@ assert (kernel.version == grsecPatch.kver);
overrideDerivation (kernel.override { overrideDerivation (kernel.override {
inherit modDirVersion; inherit modDirVersion;
kernelPatches = [ { inherit (grsecPatch) name patch; } ] ++ kernelPatches ++ (kernel.kernelPatches or []); kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []);
features = (kernel.features or {}) // { grsecurity = true; };
inherit extraConfig; inherit extraConfig;
ignoreConfigErrors = true; ignoreConfigErrors = true;
}) (attrs: { }) (attrs: {

2
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -31,6 +31,8 @@ let
url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch"; url = "https://raw.githubusercontent.com/slashbeast/grsecurity-scrape/master/${grbranch}/${name}.patch";
inherit sha256; inherit sha256;
}; };
features.grsecurity = true;
}; };
in in