about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-02-07 20:32:33 -0800
committerWilliam A. Kennington III <william@wkennington.com>2015-02-07 20:32:36 -0800
commitc8a4ecd91d82845e490fbe6ea32cddbb627b7f52 (patch)
treec253c53014d9bcba937c02567c113a123ec3e7ee
parent362d75975045c185e67cb0b66baa43d4d5e337c4 (diff)
downloadnixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar.gz
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar.bz2
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar.lz
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar.xz
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.tar.zst
nixlib-c8a4ecd91d82845e490fbe6ea32cddbb627b7f52.zip
grub: Doesn't support building bios and efi simultaneously
-rw-r--r--pkgs/tools/misc/grub/2.0x.nix2
-rw-r--r--pkgs/top-level/all-packages.nix5
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 b261dc393401..10346ca885b0 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 8efb185bcdea..498e85223028 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;
   };