From 4b73e231f9bb41a2fbc7720923715899b26bdb97 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 17 Oct 2022 17:27:00 -0700 Subject: [PATCH] linuxHeaders: use elf-header from build packages Splicing does not work correctly here, so elf-header was being pulled from the host packages. It must be pulled from the build packages since it is used by the HOSTCC for build-time tools. Note that using buildPackages here causes infinite recursion. Fixes darwin -> linux-mips cross-compilation of linuxHeaders. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93554e795c6c..1dd4b4b71133 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24853,7 +24853,7 @@ with pkgs; lkl = callPackage ../applications/virtualization/lkl { }; lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; }; - inherit (callPackages ../os-specific/linux/kernel-headers { }) + inherit (callPackages ../os-specific/linux/kernel-headers { inherit (pkgsBuildBuild) elf-header; }) linuxHeaders makeLinuxHeaders; klibc = callPackage ../os-specific/linux/klibc { };