diff options
| author | tg(x) <*@tg-x.net> | 2016-02-27 19:54:55 +0100 |
|---|---|---|
| committer | tg(x) <*@tg-x.net> | 2016-02-27 19:54:55 +0100 |
| commit | 4e3d6d3e90de85b610290af60ba374da20a2cc69 (patch) | |
| tree | 60a775b870249cf4f7ab55f22b90c894825822af /pkgs/build-support/grsecurity | |
| parent | 75f353ffbdbd5345005e6231a93dd1eae95f6785 (diff) | |
| download | nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar.gz nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar.bz2 nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar.lz nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar.xz nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.tar.zst nixpkgs-4e3d6d3e90de85b610290af60ba374da20a2cc69.zip | |
grsecurity: separate fix patches for testing & stable
Diffstat (limited to 'pkgs/build-support/grsecurity')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 77b947f906e..4a395d46459 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -25,7 +25,7 @@ let mkKernel = patch: { inherit patch; - inherit (patch) kernel grversion revision; + inherit (patch) kernel patches grversion revision; }; test-patch = with pkgs.kernelPatches; grsecurity_testing; @@ -136,7 +136,7 @@ let mkGrsecKern = grkern: lowPrio (overrideDerivation (grkern.kernel.override (args: { - kernelPatches = args.kernelPatches ++ [ grkern.patch pkgs.kernelPatches.grsec_fix_path ]; + kernelPatches = args.kernelPatches ++ [ grkern.patch ] ++ grkern.patches; argsOverride = { modDirVersion = "${grkern.kernel.modDirVersion}${localver grkern}"; }; |