From 8e643320c02fcb3854f366003d9c57ac46c3a1c2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 8 Feb 2018 04:29:12 +0200 Subject: linuxHeaders: Drop usage of kernelHeadersBaseConfig It's not actually needed, and AFAICT has never been. Or at least Buildroot can build kernel headers as old as 3.2 without running the config phase. While at it, set ARCH unconditionally. --- pkgs/os-specific/linux/kernel-headers/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 36aeb71264f..b95013ab26d 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -5,10 +5,7 @@ assert hostPlatform.isLinux; -with hostPlatform.platform.kernelHeadersBaseConfig; - let - inherit (hostPlatform.platform) kernelHeadersBaseConfig; common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation { name = "linux-headers-${version}"; @@ -17,9 +14,7 @@ let inherit sha256; }; - targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null; - - platform = hostPlatform.platform.kernelArch; + ARCH = hostPlatform.platform.kernelArch; # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # We do this so we have a build->build, not build->host, C compiler. @@ -33,10 +28,6 @@ let inherit patches; buildPhase = '' - if test -n "$targetConfig"; then - export ARCH=$platform - fi - make ${kernelHeadersBaseConfig} SHELL=bash make mrproper headers_check SHELL=bash ''; -- cgit 1.4.1