diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-03 14:34:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-03 14:34:55 +0200 |
| commit | 4745341c69772de5ddfee1f68e7421ad9d772b82 (patch) | |
| tree | 2a7835c814f31b1a4a970aaa1f07a13bd62a4b95 /pkgs/os-specific | |
| parent | 3698f321ef3d5f2a1ac132969e29095c8800cb5f (diff) | |
| download | nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar.gz nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar.bz2 nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar.lz nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar.xz nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.tar.zst nixlib-4745341c69772de5ddfee1f68e7421ad9d772b82.zip | |
spl: fix evaluation after the parent commit
This doesn't fully fix the tarball job.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index fa4953be7f9e..bed1d517e56d 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -60,9 +60,10 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ jcumming wizeman wkennington ]; - broken = kernel.features.grsecurity or + broken = buildKernel + && (kernel.features.grsecurity or # spl marked as broken until following patch is released # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b - (versionAtLeast kernel.version "4.7"); + (versionAtLeast kernel.version "4.7")); }; } |