diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-05-17 16:37:12 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-05-17 16:37:22 -0500 |
| commit | 85b5dc39492fab605267b9bf62a26b88fed91d1f (patch) | |
| tree | edaf9cef7916ef3a1a8f92157cf7fdd91f4a40dc /pkgs/build-support | |
| parent | b5b434c98a946fd20cb385ce5c7d346643dd0ff2 (diff) | |
| download | nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar.gz nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar.bz2 nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar.lz nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar.xz nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.tar.zst nixlib-85b5dc39492fab605267b9bf62a26b88fed91d1f.zip | |
grsec: Fix vserver/stable packaging
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index c44fcafe1970..a9c60a2afbd0 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -30,10 +30,11 @@ let test-patch = with pkgs.kernelPatches; grsecurity_unstable; stable-patch = with pkgs.kernelPatches; - if (cfg.vserver or false) then grsecurity_vserver else grsecurity_stable; + if cfg.vserver then grsecurity_vserver else grsecurity_stable; - stableKernel = mkKernel pkgs.linux_3_2 stable-patch; - testKernel = mkKernel pkgs.linux_3_14 test-patch; + grKernel = if (cfg.stable || cfg.vserver) + then mkKernel pkgs.linux_3_2 stable-patch + else mkKernel pkgs.linux_3_14 test-patch; ## -- grsecurity configuration --------------------------------------------- @@ -147,7 +148,7 @@ let ## -- Kernel packages ------------------------------------------------------ - grsecKernel = mkGrsecKern (if cfg.stable then stableKernel else testKernel); + grsecKernel = mkGrsecKern grKernel; grsecPackage = mkGrsecPkg grsecKernel; }; in vals |