Skip to content

Commit

Permalink
linux: fix cross-build dependencies
Browse files Browse the repository at this point in the history
This is untested but according to
#127922 (comment)

zlib is only used in the host build, which breaks cross-compilation if
not present.
  • Loading branch information
Mic92 authored and alyssais committed Sep 28, 2021
1 parent 6a463f6 commit c21ba4f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkgs/os-specific/linux/kernel/manual-config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,9 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat
++ optionals (lib.versionAtLeast version "4.16") [ bison flex ]
++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ]
++ optional (lib.versionAtLeast version "5.8") elfutils
++ optional (lib.versionAtLeast version "5.2") zlib
;

buildInputs = optional (lib.versionAtLeast version "5.2") zlib;

hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ];

# Absolute paths for compilers avoid any PATH-clobbering issues.
Expand Down

0 comments on commit c21ba4f

Please sign in to comment.