Browse Source

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.
nixos-19.03
Joachim Fasting 5 years ago
parent
commit
fc54ece470
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
  1. 15
      pkgs/build-support/grsecurity/default.nix

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

@ -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…
Cancel
Save