From 6605c0dad80d6399176706cde1893179e058320e Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Thu, 20 Jul 2023 00:50:48 +0200
Subject: openxray: 1144-december-2021-rc1 -> 1747-january-2023-rc3

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

(limited to 'pkgs/games')

diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix
index aef6c0c2e92af..05240dfb6b92d 100644
--- a/pkgs/games/openxray/default.nix
+++ b/pkgs/games/openxray/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , glew
 , freeimage
@@ -15,18 +16,30 @@
 , makeWrapper
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openxray";
-  version = "1144-december-2021-rc1";
+  version = "1747-january-2023-rc3";
 
   src = fetchFromGitHub {
     owner = "OpenXRay";
     repo = "xray-16";
-    rev = version;
+    rev = finalAttrs.version;
     fetchSubmodules = true;
-    sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v";
+    hash = "sha256-ip9CruOWk5T/dBDMcn9aOHbYaaZ+7VJw9U5GayiE7AE=";
   };
 
+  patches = [
+    # Fix OpenGL shader lookup & linking
+    # Remove when in a tag
+    (fetchpatch {
+      name = "0001-openxray-Fix-resource-linking-again.patch";
+      url = "https://github.com/OpenXRay/xray-16/commit/88d2302b490ff62344c5ab4f8ba77260402cf4f4.patch";
+      hash = "sha256-JvOwnqTThYB41ndpGrW1jVUp7rcysCTHNCEyq1fTlrY=";
+    })
+  ];
+
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     makeWrapper
@@ -56,13 +69,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    mainProgram = "xray-16";
+    mainProgram = "xr_3da";
     description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World";
     homepage = "https://github.com/OpenXRay/xray-16/";
     license = licenses.unfree // {
       url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt";
     };
     maintainers = with maintainers; [ OPNA2608 ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
   };
-}
+})
-- 
cgit 1.4.1