forked from mirrors/nixpkgs
Revert "grsecurity: overrideDerivation -> overrideAttrs"
This reverts commit 3d9017602b
.
This didn't quite work as I had expected ... While it seemed okay at
first, it fails to propagate all the attributes it used to (notably
features). I'll revisit this later but reverting for now.
This commit is contained in:
parent
a0ebb1497f
commit
fc54ece470
1 changed files with 6 additions and 9 deletions
|
@ -1,4 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, overrideDerivation
|
||||
|
||||
# required for gcc plugins
|
||||
, gmp, libmpc, mpfr
|
||||
|
@ -17,22 +19,17 @@
|
|||
|
||||
assert (kernel.version == grsecPatch.kver);
|
||||
|
||||
(kernel.override {
|
||||
overrideDerivation (kernel.override {
|
||||
inherit modDirVersion;
|
||||
# TODO: unique is a work-around
|
||||
kernelPatches = stdenv.lib.unique ([ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []));
|
||||
kernelPatches = 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;
|
||||
}).overrideAttrs (attrs: {
|
||||
nativeBuildInputs = (stdenv.lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
|
||||
}) (attrs: {
|
||||
nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []);
|
||||
preConfigure = ''
|
||||
echo ${localver} >localversion-grsec
|
||||
${attrs.preConfigure or ""}
|
||||
|
|
Loading…
Add table
Reference in a new issue