diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-29 03:57:47 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-08-29 04:09:40 +0200 |
| commit | e5c3a52afcd601df5bf8abc8c407d0e47ba266f8 (patch) | |
| tree | 70b380404f7ffaf7f05e2cee83f37ecb435098d6 /pkgs/build-support | |
| parent | b56f7acc7844beaee0dcfb9889c2e1787502d920 (diff) | |
| download | nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar.gz nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar.bz2 nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar.lz nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar.xz nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.tar.zst nixpkgs-e5c3a52afcd601df5bf8abc8c407d0e47ba266f8.zip | |
grsecurity: fix features.grsecurity
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.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 8713f2d22c4..1070d6f746d 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -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: { |