* Grub requires a 32-bit Glibc. So use the i686-linux Grub on

x86_64.  (This fails to build unless Nix knows an i686-linux machine
  or it can get the Grub binary from a channel.)  Very nasty.

svn path=/nixpkgs/trunk/; revision=7757
This commit is contained in:
Eelco Dolstra 2007-01-22 19:57:12 +00:00
parent c219e77af7
commit 1c4dd40460
2 changed files with 11 additions and 3 deletions

View File

@ -1,5 +1,9 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
if stdenv.system == "x86_64-linux" then
abort "Grub doesn't build on x86_64-linux. You should use the build for i686-linux instead."
else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "grub-0.97"; name = "grub-0.97";
src = fetchurl { src = fetchurl {

View File

@ -369,7 +369,11 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
grub = import ../tools/misc/grub { grub =
if system == "x86_64-linux" then
(import ./all-packages.nix {system = "i686-linux";}).grub
else
import ../tools/misc/grub {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };