From ef80d73e6a958046135c18a9c4a29cd756643b4a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 7 Feb 2015 15:18:37 -0800
Subject: grub: Enable zfs and efi by default since it's cheap to support

---
 pkgs/tools/misc/grub/2.0x.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/misc')

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 4ba1a949c457..b261dc393401 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , zfs ? null
-, efiSupport ? false
-, zfsSupport ? false
+, efiSupport ? true
+, zfsSupport ? true
 }:
 
 with stdenv.lib;
@@ -14,8 +14,6 @@ let
 
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
 
-  prefix = "grub${if efiSupport then "-efi" else ""}${optionalString zfsSupport "-zfs"}";
-
   version = "2.02-git-1de3a4";
 
   unifont_bdf = fetchurl {
@@ -35,7 +33,7 @@ assert efiSupport -> canEfi;
 assert zfsSupport -> zfs != null;
 
 stdenv.mkDerivation rec {
-  name = "${prefix}-${version}";
+  name = "grub-${version}";
 
   src = fetchgit {
     url = "git://git.savannah.gnu.org/grub.git";
-- 
cgit 1.4.1