From c10d43d3bd6ec003dcfe9567122c749641a9345c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 30 Sep 2011 15:37:35 +0000
Subject: [PATCH] Enable setting the headersSrc so the default kernel can be
 updated without rebuilding stdenv

svn path=/nixpkgs/branches/stdenv-updates/; revision=29547
---
 pkgs/os-specific/linux/kernel-headers/default.nix | 2 +-
 pkgs/os-specific/linux/kernel/generic.nix         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index bb2e6a28803..7153e730a4a 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -13,7 +13,7 @@ in
 stdenv.mkDerivation {
   name = "linux-headers-${version}";
 
-  src = kernel.src;
+  src = kernel.headersSrc;
 
   targetConfig = if (cross != null) then cross.config else null;
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a86aef1af8e..355f0c9c5ba 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -3,6 +3,9 @@
 , # The kernel source tarball.
   src
 
+, # The kernel headers source tarball.
+  headersSrc ? src
+
 , # The kernel version.
   version
 
@@ -69,7 +72,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   passthru = {
-    inherit version modDirVersion;
+    inherit version modDirVersion headersSrc;
     # Combine the `features' attribute sets of all the kernel patches.
     features = lib.fold (x: y: (if x ? features then x.features else {}) // y) features kernelPatches;
   };