cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

linux: cleanup zlib conditional dependency

Browse source 
zlib was added to its own optional statement, when there was already another for
5.2
This commit is contained in:
Ben Wolsieffer 2021-09-26 14:23:23 -04:00
parent 06e0a8e43a
commit a6c34ff363
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/linux/kernel/manual-config.nix
View file

@ -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" ];