From 3800d06d4ee86484f4ca0f096e352a93e5e101ab Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Wed, 31 Dec 2025 22:48:42 +0800
Subject: [PATCH] efitools: fix build with gcc15

---
 pkgs/by-name/ef/efitools/package.nix          |  5 +++-
 .../ef/efitools/remove-redundant-bool.patch   | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ef/efitools/remove-redundant-bool.patch

diff --git a/pkgs/by-name/ef/efitools/package.nix b/pkgs/by-name/ef/efitools/package.nix
index 2264bc37113c..ff0e054f0dc5 100644
--- a/pkgs/by-name/ef/efitools/package.nix
+++ b/pkgs/by-name/ef/efitools/package.nix
@@ -30,9 +30,12 @@ stdenv.mkDerivation rec {
     sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i";
   };
 
-  # https://github.com/ncroxon/gnu-efi/issues/7#issuecomment-2122741592
   patches = [
+    # https://github.com/ncroxon/gnu-efi/issues/7#issuecomment-2122741592
     ./aarch64.patch
+
+    # Fix build with gcc15
+    ./remove-redundant-bool.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ef/efitools/remove-redundant-bool.patch b/pkgs/by-name/ef/efitools/remove-redundant-bool.patch
new file mode 100644
index 000000000000..386dea8eb305
--- /dev/null
+++ b/pkgs/by-name/ef/efitools/remove-redundant-bool.patch
@@ -0,0 +1,24 @@
+From 7698d2e2fdde341677907fbbec7197c8bb3a687a Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Wed, 31 Dec 2025 22:12:04 +0800
+Subject: [PATCH] remove-redundant-bool
+
+---
+ lib/asn1/typedefs.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/asn1/typedefs.h b/lib/asn1/typedefs.h
+index 756a629..45db045 100644
+--- a/lib/asn1/typedefs.h
++++ b/lib/asn1/typedefs.h
+@@ -52,7 +52,6 @@ typedef unsigned char u_char;
+ 
+ #endif
+ 
+-typedef unsigned char bool;
+ typedef unsigned int u_int;
+ 
+ #define DBG1(s...)
+-- 
+2.51.2
+