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

Merge branch 'master' into staging

Browse Source 
Conflicts:
	pkgs/tools/system/facter/default.nix
This commit is contained in:
obadz
2016-08-29 12:44:17 +01:00
parent f3c994ca11 898edb0fbc
commit b74793bd1c
21 changed files with 291 additions and 208 deletions
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 {
inherit modDirVersion;
kernelPatches = [ { inherit (grsecPatch) name patch; } ] ++ kernelPatches ++ (kernel.kernelPatches or []);
features = (kernel.features or {}) // { grsecurity = true; };
kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []);
inherit extraConfig;
ignoreConfigErrors = true;
}) (attrs: {