alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #28519 from obsidiansystems/linux-headers-improve

Browse source 
linux-headers: Improve derivation, removing cross arg
This commit is contained in:
John Ericson 2017-08-24 11:35:04 -04:00 committed by GitHub
parent 5674da5aed 791ce593ce
commit 3964990a3f
2 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/os-specific/linux/kernel-headers/4.4.nix
View file

@ -1,19 +1,16 @@
{ stdenv, fetchurl, perl, cross ? null }:
{ stdenvNoCC, lib, buildPackages
, buildPlatform, hostPlatform
, fetchurl, perl
}:
assert cross == null -> stdenv.isLinux;
assert hostPlatform.isLinux;
let
version = "4.4.10";
kernelHeadersBaseConfig =
if cross == null
then stdenv.platform.kernelHeadersBaseConfig
else cross.platform.kernelHeadersBaseConfig;
inherit (hostPlatform.platform) kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
@ -21,23 +18,20 @@ stdenv.mkDerivation {
sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
};
targetConfig = if cross != null then cross.config else null;
targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;
platform =
if cross != null then cross.platform.kernelArch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this platform";
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");
buildInputs = [perl];
# 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.
nativeBuildInputs = [ buildPackages.stdenv.cc perl ];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
buildPhase = ''
if test -n "$targetConfig"; then
@ -63,7 +57,7 @@ stdenv.mkDerivation {
fi
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Header files and scripts for Linux kernel";
license = licenses.gpl2;
platforms = platforms.linux;

5
pkgs/top-level/all-packages.nix
View file

@ -12047,9 +12047,7 @@ with pkgs;
lkl = callPackage ../applications/virtualization/lkl { };
linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
cross = if targetPlatform != hostPlatform then targetPlatform else null;
};
linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
linuxHeaders = linuxHeaders_4_4;
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
@ -12692,7 +12690,6 @@ with pkgs;
uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
inherit (buildPackages) linuxHeaders;
gccCross = gccCrossStageStatic;
cross = assert targetPlatform != buildPlatform; targetPlatform;
});