From 4745341c69772de5ddfee1f68e7421ad9d772b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 3 Sep 2016 14:34:07 +0200 Subject: [PATCH] spl: fix evaluation after the parent commit This doesn't fully fix the tarball job. --- pkgs/os-specific/linux/spl/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index fa4953be7f9..bed1d517e56 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")); }; }