diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 22:20:56 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-17 22:20:56 +0000 |
| commit | 70cb7050f5c0826359416eb3e18682796934c920 (patch) | |
| tree | bc9c5f1dbcdc850942ea22561e1fa7e8c2e67bcc /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 7b4529cfc7b1012fc76280647f64bb8d25c37a03 (diff) | |
| download | nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar.gz nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar.bz2 nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar.lz nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar.xz nixlib-70cb7050f5c0826359416eb3e18682796934c920.tar.zst nixlib-70cb7050f5c0826359416eb3e18682796934c920.zip | |
Trying to make the linux kernels also cross-build.
svn path=/nixpkgs/trunk/; revision=20080
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 42e12314a217..9a459136dc6a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -38,6 +38,7 @@ uboot = null; kernelBaseConfig = "defconfig"; kernelAutoModules = true; + kernelTarget = "bzImage"; } , ... }: @@ -80,13 +81,14 @@ stdenv.mkDerivation { in lib.concatStringsSep "\n" ([config] ++ configFromPatches); # For UML and non-PC, just ignore all options that don't apply (We are lazy). - ignoreConfigErrors = (userModeLinux || stdenv.system == "armv5tel-linux"); + ignoreConfigErrors = (userModeLinux || platform.name != "pc"); - buildInputs = [ perl mktemp ] - ++ lib.optional (platform.uboot != null) [platform.uboot]; + buildNativeInputs = [ perl mktemp ]; + buildInputs = lib.optional (platform.uboot != null) platform.uboot; platformName = platform.name; kernelBaseConfig = platform.kernelBaseConfig; + kernelTarget = platform.kernelTarget; arch = if xen then "xen" else |