small fixes to build custom kernel

svn path=/nixpkgs/trunk/; revision=13795
This commit is contained in:
Michael Raskin 2009-01-17 13:40:12 +00:00
parent e7a94d6fef
commit 4e9b120ad2
2 changed files with 5 additions and 1 deletions

View File

@ -34,6 +34,8 @@
, # A list of additional statements to be appended to the , # A list of additional statements to be appended to the
# configuration file. # configuration file.
extraConfig ? [] extraConfig ? []
, preConfigure ? ""
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -55,6 +57,8 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
inherit preConfigure;
inherit src config; inherit src config;
patches = map (p: p.patch) kernelPatches; patches = map (p: p.patch) kernelPatches;

View File

@ -6445,7 +6445,7 @@ let
kernelPackages = kernelPackages_2_6_25; kernelPackages = kernelPackages_2_6_25;
customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) { customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools lib; inherit fetchurl stdenv perl mktemp module_init_tools;
}); });
libselinux = import ../os-specific/linux/libselinux { libselinux = import ../os-specific/linux/libselinux {