grub2: Fix zfs support
This commit is contained in:
parent
ccc758f414
commit
c369c4afbd
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, 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
|
||||||
, linuxPackages ? null
|
, linuxPackages ? null
|
||||||
, efiSupport ? false
|
, efiSupport ? false
|
||||||
@ -14,9 +14,9 @@ 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 ""}";
|
prefix = "grub${if efiSupport then "-efi" else ""}${optionalString zfsSupport "-zfs"}";
|
||||||
|
|
||||||
version = "2.02-beta2";
|
version = "2.02-git-1de3a4";
|
||||||
|
|
||||||
unifont_bdf = fetchurl {
|
unifont_bdf = fetchurl {
|
||||||
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
|
||||||
@ -30,10 +30,10 @@ assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
|
|||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${prefix}-${version}";
|
name = "${prefix}-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchgit {
|
||||||
name = "grub-2.02-beta2.tar.xz";
|
url = "git://git.savannah.gnu.org/grub.git";
|
||||||
url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
|
rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c";
|
||||||
sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
|
sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
|
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
|
||||||
|
Loading…
Reference in New Issue
Block a user