From 925e96bb232214a5a6a766e13c60b484632c510a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 23 Jan 2025 17:16:59 +0100
Subject: [PATCH] openxray: 2188-november-2023-rc1 -> 2921-january-2025-rc1

---
 pkgs/games/openxray/default.nix | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix
index 5d761fbf7f71..340e1bbf68b0 100644
--- a/pkgs/games/openxray/default.nix
+++ b/pkgs/games/openxray/default.nix
@@ -18,16 +18,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openxray";
-  version = "2188-november-2023-rc1";
+  version = "2921-january-2025-rc1";
 
   src = fetchFromGitHub {
     owner = "OpenXRay";
     repo = "xray-16";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-rRxw/uThACmT2qI8NUwJU+WbJ3BWUss6CH13R5aaHco=";
+    hash = "sha256-PYRC1t4gjT2d41ZZOZJF4u3vc0Pq7DpivEnnfbcSQYk=";
   };
 
+  # Don't force-override these please
+  postPatch = ''
+    substituteInPlace Externals/LuaJIT-proj/CMakeLists.txt \
+      --replace-fail 'set(CMAKE_OSX_SYSROOT' '#set(CMAKE_OSX_SYSROOT' \
+      --replace-fail 'set(ENV{SDKROOT}' '#set(ENV{SDKROOT}'
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -47,6 +54,16 @@ stdenv.mkDerivation (finalAttrs: {
     pcre
   ];
 
+  cmakeFlags =
+    [
+      # Breaks on Darwin
+      (lib.cmakeBool "USE_LTO" (!stdenv.hostPlatform.isDarwin))
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # This seemingly only gets set properly by CMake when using the XCode generator
+      (lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "${stdenv.hostPlatform.darwinMinVersion}")
+    ];
+
   # Crashes can happen, we'd like them to be reasonably debuggable
   cmakeBuildType = "RelWithDebInfo";
   dontStrip = true;