summary refs log tree commit diff
path: root/pkgs/tools/misc/grub
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-02-08 03:16:24 +0100
committerGitHub <noreply@github.com>2022-02-08 03:16:24 +0100
commit64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b (patch)
treea6d3aa8e863094bb8caa3f60b2cd319d831c8b3b /pkgs/tools/misc/grub
parentf612da79b462f0c86f5c0513a1fa495a768f717f (diff)
parent65c327d4b601d0d152f80f1452a2cbb037eefa08 (diff)
downloadnixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar.gz
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar.bz2
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar.lz
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar.xz
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.tar.zst
nixpkgs-64a3fb4713aa9b7b04daa0f7cd21819b653ddc9b.zip
Merge pull request #146927 from trofi/fix-grub2-on-binutils-2.36
Diffstat (limited to 'pkgs/tools/misc/grub')
-rw-r--r--pkgs/tools/misc/grub/2.0x.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index ea983d6f043..745689e312f 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
       url = "https://marc.info/?l=grub-devel&m=146193404929072&q=mbox";
       sha256 = "00wa1q5adiass6i0x7p98vynj9vsz1w0gn1g4dgz89v35mpyw2bi";
     })
+
+    # Pull upstream patch to fix linkage against binutils-2.36.
+    (fetchpatch {
+      name = "binutils-2.36";
+      url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701";
+      sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82";
+    })
   ];
 
   postPatch = if kbdcompSupport then ''