summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-28 08:58:07 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-02-28 08:58:07 +0000
commitef1918f200db0e946c2aa1dcdba8c0bc813a7a40 (patch)
tree511466c1a6d637335dd343fb5d9813c3b2c39ffa /pkgs/os-specific/linux
parent18f667a954312c0925f1636ec282d0eb2c4f94cc (diff)
downloadnixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar.gz
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar.bz2
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar.lz
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar.xz
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.tar.zst
nixpkgs-ef1918f200db0e946c2aa1dcdba8c0bc813a7a40.zip
Allowing the kernel to build in the sheevaplug natively.
svn path=/nixpkgs/trunk/; revision=20284
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 13b3cdcfb94..5979b038283 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -88,11 +88,14 @@ stdenv.mkDerivation {
   kernelTarget = stdenv.platform.kernelTarget;
   autoModules = stdenv.platform.kernelAutoModules;
   
+  # Should we trust platform.kernelArch? We can only do
+  # that once we differentiate i686/x86_64 in platforms.
   arch =
     if xen then "xen" else
     if userModeLinux then "um" else
     if stdenv.system == "i686-linux" then "i386" else
     if stdenv.system == "x86_64-linux" then "x86_64" else
+    if stdenv.system == "armv5tel-linux" then "arm" else
     abort "Platform ${stdenv.system} is not supported.";
 
   crossAttrs = let