diff options
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 9 insertions, 8 deletions
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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b51999388f52..f4fa88d6c452 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1452,11 +1452,14 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = grub2_full; - grub2_efi = grub2.override { efiSupport = true; }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_zfs = grub2.override { zfsSupport = true; }; + grub2_light = grub2_full.override { + efiSupport = false; + zfsSupport = false; + }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { inherit (gnome) libglademm; |