diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-09-26 14:23:23 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-10-08 20:09:58 -0400 |
| commit | a6c34ff3633924f0aa1b91cc0eaa4559986e6633 (patch) | |
| tree | 74c91135f69c0ad49006dbf57c6c39a6f0cab713 /pkgs/os-specific | |
| parent | 06e0a8e43a18bcbda088b54c4b931cad842ef76d (diff) | |
linux: cleanup zlib conditional dependency
zlib was added to its own optional statement, when there was already another for 5.2
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 44e0b1d77b2db..5ff9a8be77238 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" ]; |