From 0b1b0f2e9d5c7af9032d5626dc1cca2b95eb11f2 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Thu, 9 Oct 2025 14:17:14 +0200
Subject: [PATCH] keystone: fix build with gcc15

---
 pkgs/by-name/ke/keystone/gcc15.patch | 23 +++++++++++++++++++++++
 pkgs/by-name/ke/keystone/package.nix |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/ke/keystone/gcc15.patch

diff --git a/pkgs/by-name/ke/keystone/gcc15.patch b/pkgs/by-name/ke/keystone/gcc15.patch
new file mode 100644
index 000000000000..8eea12702d59
--- /dev/null
+++ b/pkgs/by-name/ke/keystone/gcc15.patch
@@ -0,0 +1,23 @@
+From 41197bc85d6b95de3345f5a09d321469c2bba58e Mon Sep 17 00:00:00 2001
+From: Jordan Moore <lockbox@struct.foo>
+Date: Mon, 2 Jun 2025 16:36:27 -0400
+Subject: [PATCH] fix: cstdint explicitly included when used
+
+* fixes error in gcc15 where this header is no longer
+  implicitly included
+---
+ llvm/include/llvm/ADT/STLExtras.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
+index 3346de9382c42274fc9e5fb4ba6334852c7c06fc..a2adf8533e23c782147d34ca97c222b32adcc61d 100644
+--- a/llvm/include/llvm/ADT/STLExtras.h
++++ b/llvm/include/llvm/ADT/STLExtras.h
+@@ -21,6 +21,7 @@
+ #include <algorithm> // for std::all_of
+ #include <cassert>
+ #include <cstddef> // for std::size_t
++#include <cstdint>
+ #include <cstdlib> // for qsort
+ #include <functional>
+ #include <iterator>
diff --git a/pkgs/by-name/ke/keystone/package.nix b/pkgs/by-name/ke/keystone/package.nix
index 30299b66ab81..39c86a25149c 100644
--- a/pkgs/by-name/ke/keystone/package.nix
+++ b/pkgs/by-name/ke/keystone/package.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     # Patches from https://github.com/keystone-engine/keystone/pull/593
+    ./gcc15.patch
     ./cmake-3.10.patch
   ];