JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Urgh, splashutils requires the klibc headers to contain header files

Browse Source 
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
This commit is contained in:
Eelco Dolstra 2006-11-26 23:24:40 +00:00
parent 2bfcec0e04
commit 510ff785e7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/klibc/builder.sh
View File

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

4
pkgs/os-specific/linux/klibc/default.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

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