diff options
| author | K900 <me@0upti.me> | 2023-07-08 16:28:57 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-07-08 16:28:57 +0300 |
| commit | dca45ca8ea07425dca73441c959e303b730e5f55 (patch) | |
| tree | 7bc868aead0a6f277ae43e35a9a07b5f9479c993 /pkgs/tools/misc/grub | |
| parent | 0d2f526dbb0736ebdef819f2eee164590f588e5c (diff) | |
| download | nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar.gz nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar.bz2 nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar.lz nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar.xz nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.tar.zst nixpkgs-dca45ca8ea07425dca73441c959e303b730e5f55.zip | |
grub: revert commit that broke reading (some) files on (some) XFS filesystems
Fixes LVM installer test.
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index d350add3b1c..cd1e2b989d5 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchFromSavannah, flex, bison, python3, autoconf, automake, libtool, bash +{ lib, stdenv, runCommand, fetchFromSavannah, fetchpatch, flex, bison, python3, autoconf, automake, libtool, bash , rsync, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , buildPackages , nixosTests @@ -83,6 +83,14 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ./add-hidden-menu-entries.patch + + # Revert upstream commit that breaks reading XFS filesystems + # FIXME: remove when fixed upstream + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ef7850c757fb3dd2462a512cfa0ff19c89fcc0b1"; + revert = true; + hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y="; + }) ]; postPatch = if kbdcompSupport then '' |