* Fix the GRUB 1 build on x86_64-linux. It didn't build because

gcc43_multi is broken in the stdenv branch.  However, for GRUB 1 we
  can just use the 32-bit build of GRUB (using callPackage_i686).

svn path=/nixpkgs/branches/stdenv-updates/; revision=25003
This commit is contained in:
Eelco Dolstra 2010-12-06 14:25:58 +00:00
parent b94588c5c4
commit bf0fa02bff

View File

@ -725,10 +725,8 @@ let
ghostscript = null;
};
grub = import ../tools/misc/grub {
inherit fetchurl autoconf automake;
stdenv = stdenv_32bit;
buggyBiosCDSupport = (getConfig ["grub" "buggyBiosCDSupport"] true);
grub = callPackage_i686 ../tools/misc/grub {
buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true;
};
grub2 = callPackage ../tools/misc/grub/1.9x.nix { };