From c8a4ecd91d82845e490fbe6ea32cddbb627b7f52 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 7 Feb 2015 20:32:33 -0800 Subject: [PATCH] grub: Doesn't support building bios and efi simultaneously --- pkgs/tools/misc/grub/2.0x.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index b261dc39340..10346ca885b 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , zfs ? null -, efiSupport ? true +, efiSupport ? false , zfsSupport ? true }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8efb185bcde..498e8522302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1456,8 +1456,11 @@ let grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2_efi = grub2_full.override { + efiSupport = true; + }; + grub2_light = grub2_full.override { - efiSupport = false; zfsSupport = false; };