* 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:
parent
c219e77af7
commit
1c4dd40460
@ -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 {
|
||||||
|
@ -369,9 +369,13 @@ rec {
|
|||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
grub = import ../tools/misc/grub {
|
grub =
|
||||||
inherit fetchurl stdenv;
|
if system == "x86_64-linux" then
|
||||||
};
|
(import ./all-packages.nix {system = "i686-linux";}).grub
|
||||||
|
else
|
||||||
|
import ../tools/misc/grub {
|
||||||
|
inherit fetchurl stdenv;
|
||||||
|
};
|
||||||
|
|
||||||
grubWrapper = import ../tools/misc/grub-wrapper {
|
grubWrapper = import ../tools/misc/grub-wrapper {
|
||||||
inherit stdenv grub diffutils gnused gnugrep coreutils;
|
inherit stdenv grub diffutils gnused gnugrep coreutils;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user