From 4cbb8f5e1c37d2ee5a20753a100902c43fd29c0f Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Sat, 14 Mar 2026 17:45:41 +0100
Subject: [PATCH] cataclysm-dda: 0.H -> 0.H-2025-07-10-0402

Instead of cherry picking backports ourselves in Nixpkgs, use upstream's
branch `0.H-branch`, which is 0.H + relevant backports.

Upstream does not seem to do point releases out of the backports branch,
but commits in it are tagged by their CI, so that is the tag we are
using.

Also ignore a warning with darwin/clang, which fails builds of stable
and git. Upstream fix is not in their backport branch, and
cataclysm-dda-git is currently behind it. See
https://github.com/CleverRaven/Cataclysm-DDA/pull/83499.
---
 pkgs/games/cataclysm-dda/common.nix |  3 +++
 pkgs/games/cataclysm-dda/stable.nix | 13 ++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index a970fc7a0fd2..b6aab0214858 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -66,6 +66,9 @@ stdenv.mkDerivation {
     patchShebangs lang/compile_mo.sh
   '';
 
+  # remove once on O.I/ahead of upstream commit 15b3cb0
+  env.NIX_CFLAGS_COMPILE = optionalString stdenv.hostPlatform.isDarwin "-Wno-missing-noreturn";
+
   makeFlags = [
     "PREFIX=$(out)"
     "LANGUAGES=all"
diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix
index cd3a9d556ecc..8d73e2d162c6 100644
--- a/pkgs/games/cataclysm-dda/stable.nix
+++ b/pkgs/games/cataclysm-dda/stable.nix
@@ -17,22 +17,17 @@ let
   };
 
   self = common.overrideAttrs (common: rec {
-    version = "0.H";
+    version = "0.H-2025-07-10-0402";
 
     src = fetchFromGitHub {
       owner = "CleverRaven";
       repo = "Cataclysm-DDA";
-      tag = "${version}-RELEASE";
-      sha256 = "sha256-ZCD5qgqYSX7sS+Tc1oNYq9soYwNUUuWamY2uXfLjGoY=";
+      # Head of 0.H-branch
+      tag = "cdda-${version}";
+      sha256 = "sha256-r4cl8cij68WmQRfg+DHQIeDBIwhgwSre6kAUYZaCPR8=n";
     };
 
     patches = [
-      # fix compilation of the vendored flatbuffers under gcc14
-      (fetchpatch {
-        name = "fix-flatbuffers-with-gcc14";
-        url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/1400b1018ff37196bd24ba4365bd50beb571ac14.patch";
-        hash = "sha256-H0jct6lSQxu48eOZ4f8HICxo89qX49Ksw+Xwwtp7iFM=";
-      })
       # Unconditionally look for translation files in $out/share/locale
       ./locale-path.patch
     ];