summary refs log tree commit diff
path: root/pkgs/tools/misc/grub
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2018-12-10 09:28:20 +0100
committerMarkus Kowalewski <markus.kowalewski@fysik.su.se>2018-12-10 13:52:55 +0100
commitaed869999310ed0d3412f514676602fb2717c0a2 (patch)
tree183992c951f3d3555a3559190d28f335100e868c /pkgs/tools/misc/grub
parentc047c26791639790fc2420747096cdefbc75ad20 (diff)
downloadnixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar.gz
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar.bz2
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar.lz
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar.xz
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.tar.zst
nixpkgs-aed869999310ed0d3412f514676602fb2717c0a2.zip
grub: add patch for XFS sparse inode feature
xfsprogs-4.16 introduced an new on disk format feature
that is not recognized properly by grub. This patch
allows grub to access XFS filesystem created with
xfsprogs >= 4.16.
This upstream patch can be removed for grub-2.03.
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r--pkgs/tools/misc/grub/2.0x.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 71d4abd9ca4..86287779792 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, python
+{ stdenv, fetchurl, fetchpatch, flex, bison, python
 , gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
 , fuse # only needed for grub-mount
 , zfs ? null
@@ -82,7 +82,16 @@ stdenv.mkDerivation rec {
       unset CPP # setting CPP intereferes with dependency calculation
     '';
 
-  patches = [ ./fix-bash-completion.patch ];
+  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";
+    })
+  ];
 
   configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
     ++ optional zfsSupport "--enable-libzfs"