From 840a78977b9c2a98bbcd1f12e11bf52dcde63b0e Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Fri, 19 Feb 2010 14:25:15 +0000
Subject: Adding a kernelArch to the 'pc' platform to keep uboot happy. This
 should fix the nixpkgs tarball evaluation.

svn path=/nixpkgs/trunk/; revision=20127
---
 pkgs/top-level/platforms.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs')

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 492a0deaf124..61ea4bafab24 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -8,6 +8,8 @@ with pkgs;
     # Build whatever possible as a module, if not stated in the extra config.
     kernelAutoModules = true;
     kernelTarget = "bzImage";
+    # This next line makes uboot happy, more than being ever used in the kernel build.
+    kernelArch = if (system == "i686-linux") then "x86" else "x86_64";
     kernelExtraConfig =
       ''
         # Virtualisation (KVM, Xen...).
-- 
cgit 1.4.1