From a6c34ff3633924f0aa1b91cc0eaa4559986e6633 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 26 Sep 2021 14:23:23 -0400 Subject: [PATCH] linux: cleanup zlib conditional dependency zlib was added to its own optional statement, when there was already another for 5.2 --- pkgs/os-specific/linux/kernel/manual-config.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 44e0b1d77b2d..5ff9a8be7723 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -315,9 +315,8 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole zlib ] ++ optional (lib.versionAtLeast version "5.8") elfutils - ++ optional (lib.versionAtLeast version "5.2") zlib ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];