summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/manual-config.nix
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-09-28 10:13:01 +0200
committerAlyssa Ross <hi@alyssa.is>2021-09-28 09:21:23 +0000
commitc21ba4f7bb4a3d621eb1d187e6b5e816bb85380c (patch)
treec3081fe25a61a2ffe9741fe23000e30abb4ac351 /pkgs/os-specific/linux/kernel/manual-config.nix
parent6a463f6dacfed947a8cc349224c352cf2c6fa4a7 (diff)
downloadnixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar.gz
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar.bz2
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar.lz
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar.xz
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.tar.zst
nixpkgs-c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c.zip
linux: fix cross-build dependencies
This is untested but according to
https://github.com/NixOS/nixpkgs/pull/127922#issuecomment-927346171

zlib is only used in the host build, which breaks cross-compilation if
not present.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/manual-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix3
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 12eca63e216..dc59a3f2610 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -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.