public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub: Enable zfs and efi by default since it's cheap to support

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-07 15:18:37 -08:00
parent 0fa4c9d6d3
commit ef80d73e6a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
, gettext, ncurses, libusb, freetype, qemu, devicemapper , gettext, ncurses, libusb, freetype, qemu, devicemapper
, zfs ? null , zfs ? null
, efiSupport ? false , efiSupport ? true
, zfsSupport ? false , zfsSupport ? true
}: }:
with stdenv.lib; with stdenv.lib;
@ -14,8 +14,6 @@ let
canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); 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"; version = "2.02-git-1de3a4";
unifont_bdf = fetchurl { unifont_bdf = fetchurl {
@ -35,7 +33,7 @@ assert efiSupport -> canEfi;
assert zfsSupport -> zfs != null; assert zfsSupport -> zfs != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${prefix}-${version}"; name = "grub-${version}";
src = fetchgit { src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git"; url = "git://git.savannah.gnu.org/grub.git";

9
pkgs/top-level/all-packages.nix
View File

@ -1452,11 +1452,14 @@ let
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; 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 { gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
inherit (gnome) libglademm; inherit (gnome) libglademm;