diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-19 14:42:50 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-19 14:42:50 +0000 |
| commit | e1760d529b4070715947d44cf389cb3077477f7c (patch) | |
| tree | 38655edcd8736d02a9dae11cff4ca9301f664ce1 /pkgs | |
| parent | 912bbd7aa13be8d724293b5484b9da37f3dc255d (diff) | |
| download | nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar.gz nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar.bz2 nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar.lz nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar.xz nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.tar.zst nixpkgs-e1760d529b4070715947d44cf389cb3077477f7c.zip | |
I still did not fix the nixpkgs tarball in the previous commit...
Next attempt, now simpler. svn path=/nixpkgs/trunk/; revision=20129
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/platforms.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 262d976730f..60bf372b8db 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, unzip, platform}: +assert (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") + || (stdenv ? cross); + stdenv.mkDerivation { name = "uboot-2009.11"; diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 61ea4bafab2..492a0deaf12 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -8,8 +8,6 @@ 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...). |