nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have the kernel headers be a linuxPackage, use the current linuxPackage's headers

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29546
This commit is contained in:
Shea Levy 2011-09-30 15:34:37 +00:00
parent 024a629e27
commit dcef7ad3bf
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pkgs/os-specific/linux/kernel-headers/default.nix Normal file
View File

@ -0,0 +1,59 @@
{stdenv, fetchurl, perl, cross ? null, kernel}:
assert cross == null -> stdenv.isLinux;
let
version = kernel.version;
kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig
else
cross.platform.kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = kernel.src;
targetConfig = if (cross != null) then cross.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.system == "armv5tel-linux" 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";
buildInputs = [perl];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make ${kernelHeadersBaseConfig}
make mrproper headers_check
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
ensureDir $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
}

4
pkgs/top-level/all-packages.nix
View File

@ -5242,7 +5242,7 @@ let
libnl1 = callPackage ../os-specific/linux/libnl/v1.nix { };
linuxHeaders = linuxHeaders_2_6_32;
linuxHeaders = linuxPackages.kernelHeaders;
linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl;
@ -5627,6 +5627,8 @@ let
broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { };