cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge another master commit into staging

Browse source 
Again, this is for sake of chained PRs having readable diffs
This commit is contained in:
John Ericson 2017-09-15 12:38:26 -04:00
commit fd988f8481
2 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,12 +20,7 @@ stdenvNoCC.mkDerivation {
targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null; targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;
platform = hostPlatform.platform.kernelArch or ( platform = hostPlatform.platform.kernelArch;
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");
# It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc. # 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. # We do this so we have a build->build, not build->host, C compiler.

29
pkgs/os-specific/linux/kernel-headers/default.nix
View file

@ -1,29 +0,0 @@
{ stdenv, kernel, perl
, hostPlatform
}:
let
baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
in stdenv.mkDerivation {
name = "linux-headers-${kernel.version}";
inherit (kernel) src patches;
nativeBuildInputs = [ perl ];
buildFlags = [ "ARCH=${stdenv.platform.kernelArch}" ] ++ baseBuildFlags;
crossAttrs = {
inherit (kernel.crossDrv) src patches;
buildFlags = [ "ARCH=${hostPlatform.platform.kernelArch}" ] ++ baseBuildFlags;
};
installPhase = ''
find $out \( -name ..install.cmd -o -name .install \) -print0 | xargs -0 rm
'';
# Headers shouldn't reference anything else
allowedReferences = [];
meta.platforms = stdenv.lib.platforms.linux;
}