From bf0fa02bffde8fa79a41eef68e47b560540e3a40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Dec 2010 14:25:58 +0000
Subject: [PATCH] * 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
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf1547064a2..8e64e245bc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };