From 81680d44c8733acf8feb69c0c787de5224bf4301 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 14 Sep 2017 19:24:48 -0400 Subject: linux-headers 4.4: Remove arch fallback code @dezgeg was right: The `platform` field of a linux platorm is already manadatory---if not specified it is inferred, and all such inferences include a `kernelArch` field. Therefore linux packages can indeed rely on it being defined. --- pkgs/os-specific/linux/kernel-headers/4.4.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'pkgs/os-specific/linux/kernel-headers') diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix index 716ad799bc6..0ef5280d13b 100644 --- a/pkgs/os-specific/linux/kernel-headers/4.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/4.4.nix @@ -20,12 +20,7 @@ stdenvNoCC.mkDerivation { targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null; - platform = hostPlatform.platform.kernelArch or ( - if hostPlatform.system == "i686-linux" then "i386" else - if hostPlatform.system == "x86_64-linux" then "x86_64" else - if hostPlatform.system == "powerpc-linux" then "powerpc" else - if hostPlatform.isArm then "arm" else - abort "don't know what the kernel include directory is called for this platform"); + platform = 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. -- cgit 1.4.1