diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2017-02-09 16:21:20 +0100 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-02-09 16:23:06 +0100 |
commit | 3d9017602b0f0dbe8e4c0706cda32e8f8b38311b (patch) | |
tree | 9449587760fdfe0bece1d04024005bd32e144e13 /pkgs/build-support | |
parent | 28b5cc7dca44db6f229f5c9b8926275865446025 (diff) |
grsecurity: overrideDerivation -> overrideAttrs
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index ccd46e20654f..f1310446964d 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -1,6 +1,4 @@ { stdenv -, lib -, overrideDerivation # required for gcc plugins , gmp, libmpc, mpfr @@ -19,17 +17,22 @@ assert (kernel.version == grsecPatch.kver); -overrideDerivation (kernel.override { +(kernel.override { inherit modDirVersion; - kernelPatches = lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or [])); + # TODO: unique is a work-around + kernelPatches = stdenv.lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or [])); extraConfig = '' GRKERNSEC y PAX y ${extraConfig} ''; + + # Enabling grsecurity/PaX deselects several other options implicitly, + # causing the configfile checker to fail (when it finds that options + # expected to be enabled are not). ignoreConfigErrors = true; -}) (attrs: { - nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); +}).overrideAttrs (attrs: { + nativeBuildInputs = (stdenv.lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); preConfigure = '' echo ${localver} >localversion-grsec ${attrs.preConfigure or ""} |