Author: shlevy
Date: Fri Sep 30 15:34:37 2011
New Revision: 29546
URL: https://ssl.nixos.org/websvn/nix/?rev=29546&sc=1
Log:
Have the kernel headers be a linuxPackage, use the current linuxPackage's
headers
Added:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
- copied, changed from r29541,
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
(from r29541,
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix)
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
Thu Sep 29 20:57:47 2011 (r29541, copy source)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/default.nix
Fri Sep 30 15:34:37 2011 (r29546)
@@ -1,9 +1,9 @@
-{stdenv, fetchurl, perl, cross ? null}:
+{stdenv, fetchurl, perl, cross ? null, kernel}:
assert cross == null -> stdenv.isLinux;
let
- version = "2.6.32.16";
+ version = kernel.version;
kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig
else
@@ -13,10 +13,7 @@
stdenv.mkDerivation {
name = "linux-headers-${version}";
- src = fetchurl {
- url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
- sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
- };
+ src = kernel.src;
targetConfig = if (cross != null) then cross.config else null;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Sep
30 15:29:30 2011 (r29545)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Sep
30 15:34:37 2011 (r29546)
@@ -5242,7 +5242,7 @@
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 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
