From 510ff785e7d13f3ca0e3be8bfed638992b218dcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:24:40 +0000
Subject: [PATCH] * Urgh, splashutils requires the klibc headers to contain
 header files   from the fbsplash kernel patch.  So use the actual patched
 kernel as   an input to klibc, instead of Glibc's kernel headers.

svn path=/nixpkgs/trunk/; revision=7138
---
 pkgs/os-specific/linux/klibc/builder.sh  | 2 +-
 pkgs/os-specific/linux/klibc/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh
index d4a9f560e21f..a6e7abf82015 100644
--- a/pkgs/os-specific/linux/klibc/builder.sh
+++ b/pkgs/os-specific/linux/klibc/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
 preBuild=preBuild
 preBuild() {
   mkdir -p linux/include
-  ln -s $kernelHeaders/include/* linux/include/
+  ln -s $kernel/lib/modules/*/build/include/* linux/include/
 }
 
 makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib)
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 64ee86a9435a..d016759e7747 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, bison, mktemp}:
+{stdenv, fetchurl, perl, bison, mktemp, kernel}:
 
 assert stdenv.isLinux;
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     url = http://www.kernel.org/pub/linux/libs/klibc/klibc-1.4.tar.bz2;
     md5 = "f4e0e17fc660e59c39e448fe1d827d36";
   };
-  inherit (stdenv.glibc) kernelHeaders;
+  inherit kernel;
   buildInputs = [perl bison mktemp];
   patches = [./install.patch];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d644512c2c24..8bf29d427ee5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2142,7 +2142,7 @@ rec {
   };
 
   klibc = import ../os-specific/linux/klibc {
-    inherit fetchurl stdenv perl bison mktemp;
+    inherit fetchurl stdenv perl bison mktemp kernel;
   };
 
   mingetty = import ../os-specific/linux/mingetty {