diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-19 14:25:15 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-19 14:25:15 +0000 |
| commit | 840a78977b9c2a98bbcd1f12e11bf52dcde63b0e (patch) | |
| tree | 62cadbdf96104bddd9120f91b8d2482d0c57680f /pkgs | |
| parent | af717b48f4c8569f1ccd9273df9dae707a22b708 (diff) | |
| download | nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar.gz nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar.bz2 nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar.lz nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar.xz nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.tar.zst nixlib-840a78977b9c2a98bbcd1f12e11bf52dcde63b0e.zip | |
Adding a kernelArch to the 'pc' platform to keep uboot happy.
This should fix the nixpkgs tarball evaluation. svn path=/nixpkgs/trunk/; revision=20127
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/platforms.nix | 2 |
1 files changed, 2 insertions, 0 deletions
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...). |