* Use the 2.6.20 kernel headers.
svn path=/nixpkgs/trunk/; revision=8769
This commit is contained in:
parent
659023aa97
commit
8d3160f8b0
@ -1,21 +0,0 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "linux-headers-2.6.20";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2;
|
||||
sha256 = "0n455dyvmbs9l0m3hll2rilyrj8gsqqablrhnh1jw9vxmjhss51c";
|
||||
};
|
||||
|
||||
platform =
|
||||
if stdenv.system == "i686-linux" then "i386" else
|
||||
if stdenv.system == "x86_64-linux" then "x86_64" else
|
||||
if stdenv.system == "powerpc-linux" then "powerpc" else
|
||||
abort "don't know what the kernel include directory is called for this platform";
|
||||
|
||||
extraIncludeDirs =
|
||||
if stdenv.system == "powerpc-linux" then ["ppc"] else [];
|
||||
}
|
@ -3,11 +3,11 @@
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "linux-headers-2.6.18.1";
|
||||
name = "linux-headers-2.6.20.11";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.1.tar.bz2;
|
||||
md5 = "38f00633b02f07819d17bcd87d03eb3a";
|
||||
url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.11.tar.bz2";
|
||||
sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
|
||||
};
|
||||
|
||||
platform =
|
||||
|
@ -2239,10 +2239,6 @@ rec {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
kernelHeaders_2_6_20 = import ../os-specific/linux/kernel-headers/2.6.20.nix {
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
kernelscripts = import ../os-specific/linux/kernelscripts {
|
||||
inherit stdenv module_init_tools kernel;
|
||||
modules = [];
|
||||
@ -2289,7 +2285,7 @@ rec {
|
||||
kvm12 = import ../os-specific/linux/kvm/12.nix {
|
||||
inherit fetchurl zlib e2fsprogs SDL alsaLib;
|
||||
stdenv = overrideGCC stdenv gcc34;
|
||||
kernelHeaders = kernelHeaders_2_6_20;
|
||||
kernelHeaders = stdenv.gcc.libc.kernelHeaders;
|
||||
};
|
||||
|
||||
libcap = import ../os-specific/linux/libcap {
|
||||
|
Loading…
Reference in New Issue
Block a user