diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 19:26:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 19:26:44 +0200 |
| commit | 888f6a1280370de4f8268e0bae8d4b49d4db4cbc (patch) | |
| tree | 80bd6b2ddfc435bf19ce2061867a2d8c5622f653 /pkgs/build-support | |
| parent | 54867a040055813462156809a33a260d8bf60642 (diff) | |
| parent | 2ad13953a45a54816b73632277dcdbeda063827e (diff) | |
| download | nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.gz nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.bz2 nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.lz nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.xz nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.tar.zst nixpkgs-888f6a1280370de4f8268e0bae8d4b49d4db4cbc.zip | |
Merge pull request #19199 from wizeman/u/fix-help2man-hash
help2man: fix hash
Diffstat (limited to 'pkgs/build-support')
| -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 []); |