mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
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.
This commit is contained in:
parent
0ea1c45b04
commit
8e643320c0
@ -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
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user