summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel-headers
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-08 04:29:12 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-02-14 01:47:28 +0200
commit8e643320c02fcb3854f366003d9c57ac46c3a1c2 (patch)
treed6f907b31dad06b2053d154b6fc177a84abed671 /pkgs/os-specific/linux/kernel-headers
parent0ea1c45b0437b121f3def419c1b81e34d4ea08dc (diff)
downloadnixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar.gz
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar.bz2
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar.lz
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar.xz
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.tar.zst
nixpkgs-8e643320c02fcb3854f366003d9c57ac46c3a1c2.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
-rw-r--r--pkgs/os-specific/linux/kernel-headers/default.nix11
1 files changed, 1 insertions, 10 deletions
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
     '';