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

Replace `kernelHeaders' by `linuxHeaders'. 

svn path=/nixpkgs/branches/stdenv-updates/; revision=19067
This commit is contained in:
Ludovic Courtès 2009-12-21 14:04:45 +00:00
parent 310d6e4bbf
commit fac9a5c936
11 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/autofs/autofs-v5.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation {
#make install SUBDIRS="samples" # impure! #make install SUBDIRS="samples" # impure!
''; '';
buildInputs = [flex bison kernelHeaders]; buildInputs = [flex bison linuxHeaders];
meta = { meta = {
description="Kernel based automounter"; description="Kernel based automounter";

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, glibc, libtool, gettext}: {stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}:
assert stdenv.isLinux && stdenv.system != "powerpc-linux"; assert stdenv.isLinux && stdenv.system != "powerpc-linux";
@ -16,5 +16,5 @@ stdenv.mkDerivation {
-i Makefile -i Makefile
''; '';
buildInputs = [ kernelHeaders glibc libtool gettext ]; buildInputs = [ linuxHeaders glibc libtool gettext ];
} }

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, glibc}: {stdenv, fetchurl, linuxHeaders, glibc}:
assert stdenv.isLinux && stdenv.system != "powerpc-linux"; assert stdenv.isLinux && stdenv.system != "powerpc-linux";
@ -10,6 +10,6 @@ stdenv.mkDerivation {
md5 = "b5493f7a2997130a4f86c486c9993b86"; md5 = "b5493f7a2997130a4f86c486c9993b86";
}; };
inherit kernelHeaders glibc; inherit linuxHeaders glibc;
patches = [ ./open-max.patch ]; patches = [ ./open-max.patch ];
} }

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, bison, mktemp, kernelHeaders}: {stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -18,7 +18,7 @@ stdenv.mkDerivation {
makeFlags=$(eval "echo $makeFlags") makeFlags=$(eval "echo $makeFlags")
mkdir linux mkdir linux
cp -prsd ${kernelHeaders}/include linux/ cp -prsd ${linuxHeaders}/include linux/
chmod -R u+w linux/include/ chmod -R u+w linux/include/
''; # */ ''; # */

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, bison, mktemp, kernelHeaders}: {stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -20,7 +20,7 @@ stdenv.mkDerivation {
makeFlags=$(eval "echo $makeFlags") makeFlags=$(eval "echo $makeFlags")
mkdir linux mkdir linux
cp -prsd ${kernelHeaders}/include linux/ cp -prsd ${linuxHeaders}/include linux/
chmod -R u+w linux/include/ chmod -R u+w linux/include/
''; # */ ''; # */

4
pkgs/os-specific/linux/kvm/76.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}: {stdenv, fetchurl, linuxHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -18,7 +18,7 @@ stdenv.mkDerivation {
./readonly-kernel-r2.patch ./readonly-kernel-r2.patch
]; ];
configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}"; configureFlags = "--with-patched-kernel --kerneldir=${linuxHeaders}";
# e2fsprogs is needed for libuuid. # e2fsprogs is needed for libuuid.
# rsync is a weird dependency used for copying kernel header files. # rsync is a weird dependency used for copying kernel header files.

2
pkgs/os-specific/linux/kvm/86.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}: {stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
assert stdenv.isLinux; assert stdenv.isLinux;

2
pkgs/os-specific/linux/kvm/88.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}: {stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
assert stdenv.isLinux; assert stdenv.isLinux;

6
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernelHeaders, gccCross ? null}: {stdenv, fetchurl, linuxHeaders, gccCross ? null}:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -33,7 +33,7 @@ stdenv.mkDerivation {
configurePhase = '' configurePhase = ''
make defconfig ${archMakeFlag} make defconfig ${archMakeFlag}
sed -e s@/usr/include@${kernelHeaders}/include@ \ sed -e s@/usr/include@${linuxHeaders}/include@ \
-e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \ -e 's@^RUNTIME_PREFIX.*@RUNTIME_PREFIX="/"@' \
-e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \ -e 's@^DEVEL_PREFIX.*@DEVEL_PREFIX="/"@' \
-e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \ -e 's@.*UCLIBC_HAS_WCHAR.*@UCLIBC_HAS_WCHAR=y@' \
@ -60,7 +60,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
make PREFIX=$out VERBOSE=1 install ${crossMakeFlag} make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
(cd $out/include && ln -s ${kernelHeaders}/include/* .) || exit 1 (cd $out/include && ln -s ${linuxHeaders}/include/* .) || exit 1
sed -i s@/lib/@$out/lib/@g $out/lib/libc.so sed -i s@/lib/@$out/lib/@g $out/lib/libc.so
''; '';

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

@ -1,8 +1,8 @@
{lib, stdenv, fetchurl, kernelHeaders , readline, tunctl ? false, mconsole ? false}: {lib, stdenv, fetchurl, linuxHeaders , readline, tunctl ? false, mconsole ? false}:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit tunctl mconsole; inherit tunctl mconsole;
buildInputs = lib.optional tunctl kernelHeaders buildInputs = lib.optional tunctl linuxHeaders
++ lib.optional mconsole readline; ++ lib.optional mconsole readline;
name = "uml-utilities-20040114"; name = "uml-utilities-20040114";
builder = ./builder.sh; builder = ./builder.sh;

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

@ -3502,48 +3502,53 @@ let
glibc211); glibc211);
glibc25 = import ../development/libraries/glibc-2.5 { glibc25 = import ../development/libraries/glibc-2.5 {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc27 = import ../development/libraries/glibc-2.7 { glibc27 = import ../development/libraries/glibc-2.7 {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
#installLocales = false; #installLocales = false;
}; };
glibc29 = makeOverridable (import ../development/libraries/glibc-2.9) { glibc29 = makeOverridable (import ../development/libraries/glibc-2.9) {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc29Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) { glibc29Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) {
inherit stdenv fetchurl; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic cross; gccCross = gccCrossStageStatic cross;
kernelHeaders = kernelHeadersCross cross; kernelHeaders = linuxHeadersCross cross;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) { glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) { glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) {
inherit stdenv fetchurl; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic cross; gccCross = gccCrossStageStatic cross;
kernelHeaders = kernelHeadersCross cross; kernelHeaders = linuxHeadersCross cross;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) { glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc211Cross = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) { glibc211Cross = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) {
inherit stdenv fetchurl; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic cross; gccCross = gccCrossStageStatic cross;
kernelHeaders = kernelHeadersCross cross; kernelHeaders = linuxHeadersCross cross;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
@ -3552,7 +3557,8 @@ let
# libcCross = cross: uclibcCross cross; # libcCross = cross: uclibcCross cross;
eglibc = import ../development/libraries/eglibc { eglibc = import ../development/libraries/eglibc {
inherit fetchsvn stdenv kernelHeaders; inherit fetchsvn stdenv;
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
@ -5296,7 +5302,7 @@ let
}; };
autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix { autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix {
inherit sourceFromHead fetchurl stdenv flex bison kernelHeaders; inherit sourceFromHead fetchurl stdenv flex bison linuxHeaders;
}; };
_915resolution = import ../os-specific/linux/915resolution { _915resolution = import ../os-specific/linux/915resolution {
@ -5346,7 +5352,7 @@ let
import ../os-specific/linux/cpufrequtils { import ../os-specific/linux/cpufrequtils {
inherit fetchurl stdenv libtool gettext; inherit fetchurl stdenv libtool gettext;
glibc = stdenv.gcc.libc; glibc = stdenv.gcc.libc;
kernelHeaders = stdenv.gcc.libc.kernelHeaders; linuxHeaders = stdenv.gcc.libc.kernelHeaders;
}); });
cryopid = import ../os-specific/linux/cryopid { cryopid = import ../os-specific/linux/cryopid {
@ -5466,7 +5472,7 @@ let
import ../os-specific/linux/iputils { import ../os-specific/linux/iputils {
inherit fetchurl stdenv; inherit fetchurl stdenv;
glibc = stdenv.gcc.libc; glibc = stdenv.gcc.libc;
kernelHeaders = stdenv.gcc.libc.kernelHeaders; linuxHeaders = stdenv.gcc.libc.kernelHeaders;
}); });
iptables = import ../os-specific/linux/iptables { iptables = import ../os-specific/linux/iptables {
@ -5497,31 +5503,31 @@ let
inherit fetchurl stdenv bison flex; inherit fetchurl stdenv bison flex;
}; };
kernelHeaders = kernelHeaders_2_6_28; linuxHeaders = linuxHeaders_2_6_28;
kernelHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.28.nix { linuxHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.28.nix {
inherit stdenv fetchurl cross perl; inherit stdenv fetchurl cross perl;
}); });
kernelHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {
inherit fetchurl stdenv unifdef; inherit fetchurl stdenv unifdef;
}; };
kernelHeaders_2_6_28 = import ../os-specific/linux/kernel-headers/2.6.28.nix { linuxHeaders_2_6_28 = import ../os-specific/linux/kernel-headers/2.6.28.nix {
inherit fetchurl stdenv perl; inherit fetchurl stdenv perl;
}; };
kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross { linuxHeadersArm = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv; inherit fetchurl stdenv;
cross = "arm-linux"; cross = "arm-linux";
}; };
kernelHeadersMips = import ../os-specific/linux/kernel-headers-cross { linuxHeadersMips = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv; inherit fetchurl stdenv;
cross = "mips-linux"; cross = "mips-linux";
}; };
kernelHeadersSparc = import ../os-specific/linux/kernel-headers-cross { linuxHeadersSparc = import ../os-specific/linux/kernel-headers-cross {
inherit fetchurl stdenv; inherit fetchurl stdenv;
cross = "sparc-linux"; cross = "sparc-linux";
}; };
@ -5766,14 +5772,14 @@ let
klibc = makeOverridable (import ../os-specific/linux/klibc) { klibc = makeOverridable (import ../os-specific/linux/klibc) {
inherit fetchurl stdenv perl bison mktemp; inherit fetchurl stdenv perl bison mktemp;
kernelHeaders = glibc.kernelHeaders; linuxHeaders = glibc.kernelHeaders;
}; };
# Old version; needed in vmtools for insmod. Should use # Old version; needed in vmtools for insmod. Should use
# module_init_tools instead. # module_init_tools instead.
klibc_15 = makeOverridable (import ../os-specific/linux/klibc/1.5.nix) { klibc_15 = makeOverridable (import ../os-specific/linux/klibc/1.5.nix) {
inherit fetchurl stdenv perl bison mktemp; inherit fetchurl stdenv perl bison mktemp;
kernelHeaders = glibc.kernelHeaders; linuxHeaders = glibc.kernelHeaders;
}; };
klibcShrunk = makeOverridable (import ../os-specific/linux/klibc/shrunk.nix) { klibcShrunk = makeOverridable (import ../os-specific/linux/klibc/shrunk.nix) {
@ -5784,17 +5790,17 @@ let
kvm76 = import ../os-specific/linux/kvm/76.nix { kvm76 = import ../os-specific/linux/kvm/76.nix {
inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync; inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
inherit (glibc) kernelHeaders; linuxHeaders = glibc.kernelHeaders;
}; };
kvm86 = import ../os-specific/linux/kvm/86.nix { kvm86 = import ../os-specific/linux/kvm/86.nix {
inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils; inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
inherit (glibc) kernelHeaders; linuxHeaders = glibc.kernelHeaders;
}; };
kvm88 = import ../os-specific/linux/kvm/88.nix { kvm88 = import ../os-specific/linux/kvm/88.nix {
inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils; inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
inherit (glibc) kernelHeaders; linuxHeaders = glibc.kernelHeaders;
}; };
libcap = import ../os-specific/linux/libcap { libcap = import ../os-specific/linux/libcap {
@ -6005,12 +6011,12 @@ let
}; };
uclibc = import ../os-specific/linux/uclibc { uclibc = import ../os-specific/linux/uclibc {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv linuxHeaders;
}; };
uclibcCross = target: import ../os-specific/linux/uclibc { uclibcCross = target: import ../os-specific/linux/uclibc {
inherit fetchurl stdenv; inherit fetchurl stdenv;
kernelHeaders = kernelHeadersCross target; linuxHeaders = linuxHeadersCross target;
gccCross = gccCrossStageStatic target; gccCross = gccCrossStageStatic target;
}; };
@ -6024,7 +6030,7 @@ let
}; };
umlutilities = import ../os-specific/linux/uml-utilities { umlutilities = import ../os-specific/linux/uml-utilities {
inherit fetchurl kernelHeaders stdenv readline lib; inherit fetchurl linuxHeaders stdenv readline lib;
tunctl = true; mconsole = true; tunctl = true; mconsole = true;
}; };