diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index af43d5e83961..c8ffd677c930 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; - rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c"; - sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc"; + rev = "32cd33bd19348afb77ab849846e0b6d6157ea308"; + sha256 = "1fsc1sa5ymdkf11bshlh8fwqv7j7c4pfzjdf6ivllpanp02ryv4l"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; - patches = [ ./fix-bash-completion.patch ./glibc-2.20.patch ]; + patches = [ ./fix-bash-completion.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; diff --git a/pkgs/tools/misc/grub/glibc-2.20.patch b/pkgs/tools/misc/grub/glibc-2.20.patch deleted file mode 100644 index 6bb4f677541b..000000000000 --- a/pkgs/tools/misc/grub/glibc-2.20.patch +++ /dev/null @@ -1,29 +0,0 @@ -* grub-core/kern/emu/hostfs.c: squahes below warning - warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use -_DEFAULT_SOURCE" - -Signed-off-by: Khem Raj - -Upstream-Status: Submitted ---- - grub-core/kern/emu/hostfs.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c -index 7e725f6..823116d 100644 ---- a/grub-core/kern/emu/hostfs.c -+++ b/grub-core/kern/emu/hostfs.c -@@ -19,7 +19,11 @@ - - #include - -+/* Legacy feature macro.*/ - #define _BSD_SOURCE -+/* New feature macro that provides everything _BSD_SOURCE and -+ * _SVID_SOURCE provided and possibly more. */ -+#define _DEFAULT_SOURCE - #include - #include - #include --- -2.1.0