diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-26 23:24:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-26 23:24:40 +0000 |
| commit | 510ff785e7d13f3ca0e3be8bfed638992b218dcd (patch) | |
| tree | 5b1d25b25515d0d72a17c7093f9e0daa815ac828 /pkgs/os-specific/linux/klibc | |
| parent | 2bfcec0e04dd9cb87dadf7fffca9b1b8d7d18bec (diff) | |
* 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
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh index d4a9f560e21fc..a6e7abf820155 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 64ee86a9435af..d016759e7747c 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]; } |