From b6118e50720b2f345ff9d6c4788597464ceb41a4 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Sat, 6 Dec 2025 06:36:51 +0000
Subject: [PATCH 1/2] fex: 2511 -> 2512

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

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 62da7dd5f4b8..dad3eda0cc6e 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -95,13 +95,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2511";
+  version = "2512";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc=";
+    hash = "sha256-G61FdzNctTp8jarTcnBXd+MQpMxnPqd33hblvi9UXNo=";
 
     leaveDotGit = true;
     postFetch = ''

From 14c8db99b232ffdcf946b082056d455506381668 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Sun, 7 Dec 2025 20:15:50 +0000
Subject: [PATCH 2/2] fex: skip checkPhase on non-4K pagesize systems

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

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index dad3eda0cc6e..22c2f199c903 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -192,7 +192,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeFeature "USE_LINKER" "lld")
     (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
-    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
     (lib.cmakeBool "BUILD_THUNKS" true)
     (lib.cmakeBool "BUILD_FEXCONFIG" withQt)
     (lib.cmakeFeature "X86_32_TOOLCHAIN_FILE" "${toolchain32}")
@@ -202,8 +201,21 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  # Unsupported on non-4K page size kernels (e.g. Apple Silicon)
+  # Running the tests isn't supported on non-4K pagesize systems, but the build
+  # itself doesn't require 4K pagesize. So, to avoid breaking the build, enable
+  # checkPhase by default (so that the check inputs are included) and then
+  # manually disable it if we're running on a non-4K pagesize system.
   doCheck = true;
+  preConfigure = ''
+    if [ "$(getconf PAGESIZE)" != "4096" ]; then
+      echo "Disabling checkPhase due to non-4K pagesize environment"
+      unset doCheck
+      cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE")
+    else
+      echo "Keeping checkPhase as-is"
+      cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}")
+    fi
+  '';
 
   nativeCheckInputs = [ nasm ];
   checkInputs = [ catch2_3 ];