diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/grub/2.0x.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index fa1729b929c0..ec1c5897ed79 100644 --- a/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, flex, bison, python +{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -31,7 +31,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.02"; + version = "2.04-rc1"; in ( @@ -42,28 +42,18 @@ assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { name = "grub-${version}"; - src = fetchurl { - url = "mirror://gnu/grub/${name}.tar.xz"; - sha256 = "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1"; + src = fetchgit { + url = "git://git.savannah.gnu.org/grub.git"; + rev = name; + sha256 = "0xkcfxs0hbzvi33kg4abkayl8b7gym9sv8ljbwlh2kpz8i4kmnk0"; }; patches = [ ./fix-bash-completion.patch - # This patch makes grub compatible with the XFS sparse inode - # feature introduced by xfsprogs-4.16. - # to be removed in grub-2.03 - (fetchpatch { - url = https://git.savannah.gnu.org/cgit/grub.git/patch/?id=cda0a857dd7a27cd5d621747464bfe71e8727fff; - sha256 = "0k9qrkdxwdqk6sz05q9smqwjr6pvgc9adx1mlf0807g4im91xnm0"; - }) - ./relocation-not-implemented.diff ]; - postPatch = '' - substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' - ''; - nativeBuildInputs = [ bison flex python pkgconfig ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse ] + nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; + buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; @@ -91,6 +81,15 @@ stdenv.mkDerivation rec { -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' unset CPP # setting CPP intereferes with dependency calculation + + cp -r ${gnulib} $PWD/gnulib + chmod u+w -R $PWD/gnulib + + patchShebangs . + + ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib + + substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' ''; configureFlags = [ "--enable-grub-mount" ] # dep of os-prober |