diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-02 18:30:15 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-10-02 19:25:58 +0200 |
commit | 1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7 (patch) | |
tree | 82993bd7e9f9b344d39f8dd61aa96f8dbc8ca6c2 /pkgs/build-support/grsecurity/default.nix | |
parent | a58f5ffbb9a202279cdcc0a5d45ed14a59dd6176 (diff) | |
download | nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.gz nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.bz2 nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.lz nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.xz nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.tar.zst nixpkgs-1bb7b44cd7970780170f1c4bb4bba8d91f5e06d7.zip |
grsecurity: make GRKERNSEC y and PAX y implicit
These options should always be specified. Note, an implication of this change is that not specifying any grsec/PaX options results in a build failure.
Diffstat (limited to 'pkgs/build-support/grsecurity/default.nix')
-rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 19aa57ccd99..4379b1997ae 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -22,7 +22,11 @@ assert (kernel.version == grsecPatch.kver); overrideDerivation (kernel.override { inherit modDirVersion; kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []); - inherit extraConfig; + extraConfig = '' + GRKERNSEC y + PAX y + ${extraConfig} + ''; ignoreConfigErrors = true; }) (attrs: { nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); |