* 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

@@ -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)

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];
 }

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 {