From 8eb559de30f26afe8a8d329a1311eb9799392ea2 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Thu, 9 Oct 2025 01:26:12 +0000
Subject: [PATCH] fex: 2509.1 -> 2510, patch to build with LLVM 21

---
 pkgs/by-name/fe/fex/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 235b4260282c..25858a8a4a05 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -26,6 +26,7 @@
   xorg,
   withQt ? true,
   qt6,
+  fetchpatch,
 }:
 
 let
@@ -95,13 +96,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2509.1";
+  version = "2510";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";
+    hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA=";
 
     leaveDotGit = true;
     postFetch = ''
@@ -127,6 +128,16 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  patches = [
+    # Backported fix of unit test build with LLVM 21.
+    # TODO: drop after next release
+    (fetchpatch {
+      name = "unittests-thunklibs-fix-build-with-llvm-21.patch";
+      url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch";
+      hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \
       --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \