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

grsecurity: overrideDerivation -> overrideAttrs

This commit is contained in:
Joachim Fasting 2017-02-09 16:21:20 +01:00
parent 28b5cc7dca
commit 3d9017602b
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/build-support/grsecurity/default.nix
View File

@ -1,6 +1,4 @@
{ stdenv { stdenv
, lib
, overrideDerivation
# required for gcc plugins # required for gcc plugins
, gmp, libmpc, mpfr , gmp, libmpc, mpfr
@ -19,17 +17,22 @@
assert (kernel.version == grsecPatch.kver); assert (kernel.version == grsecPatch.kver);
overrideDerivation (kernel.override { (kernel.override {
inherit modDirVersion; 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 = '' extraConfig = ''
GRKERNSEC y GRKERNSEC y
PAX y PAX y
${extraConfig} ${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; ignoreConfigErrors = true;
}) (attrs: { }).overrideAttrs (attrs: {
nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); nativeBuildInputs = (stdenv.lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
preConfigure = '' preConfigure = ''
echo ${localver} >localversion-grsec echo ${localver} >localversion-grsec
${attrs.preConfigure or ""} ${attrs.preConfigure or ""}