From 5d163632d9338bccf9d1fc899c9047214326c648 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 31 May 2023 18:51:24 +0300 Subject: [PATCH] grub: backport patch to fix e2fsprogs 1.47 incompatibility (cherry picked from commit 60b63941c60e3ce7fb7c59bebf4c353f906da4ba) --- pkgs/tools/misc/grub/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 298fe7fd036fb21..5d14551a860ab28 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -341,6 +341,12 @@ stdenv.mkDerivation rec { url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1514678888595ef41a968a0c69b7ff769edd1e9c"; sha256 = "sha256-tgAEoAtaNKJjscjMFkXXiVn59Pa4c+NiQ3iVW6CMrpo="; }) + + # fix incompatibility with e2fsprogs 1.47+ + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763"; + sha256 = "sha256-pejn1bJkC7XnT2ODaxeERHUrMOONoBV6w0wF2Z2ZKWI="; + }) ]; postPatch = if kbdcompSupport then ''