From 55f0fdf30bb191ec7ff67ae5220e39c668edb3cb Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 25 May 2026 14:51:39 +0200
Subject: [PATCH 1/2] dfhack: move env variables into env for structuredAttrs

(cherry picked from commit b58a49e4e426db359e529159d7e08ec1ff5f02e3)
---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 23bf1b462982..1bd3a49945c9 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -145,8 +145,19 @@ stdenv.mkDerivation {
     # Use SDL_GetPrefPath since this takes XDG_DATA_HOME into account (which is correct).
     ++ optional (versionAtLeast version "52.02-r2") ./use-df-linux-dir.patch;
 
-  # gcc 11 fix
-  CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";
+  env = {
+    # gcc 11 fix
+    CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";
+
+    NIX_CFLAGS_COMPILE = toString (
+      [
+        "-Wno-error=deprecated-enum-enum-conversion"
+      ]
+      ++ optionals (versionOlder version "0.47") [
+        "-fpermissive"
+      ]
+    );
+  };
 
   nativeBuildInputs = [
     cmake
@@ -200,11 +211,6 @@ stdenv.mkDerivation {
     "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${fetchOverrides}"
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-Wno-error=deprecated-enum-enum-conversion"
-  ]
-  ++ optionals (versionOlder version "0.47") [ "-fpermissive" ];
-
   preFixup = ''
     # Wrap dfhack scripts.
     if [ -f $out/dfhack ]; then

From cbe69277cff7b2f37319379597cc26e17ded4585 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 25 May 2026 16:02:04 -0700
Subject: [PATCH 2/2] dfhack: fix hash

The provided hash was for -r1, not -r2, which didn't work if you didn't
have a FOD cached.

(cherry picked from commit 12272aedde17f018a0df73cc062e6d2d4e6b2c0d)
---
 pkgs/games/dwarf-fortress/df.lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index 8ae54a7a5936..03bf7fd55d19 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -20,7 +20,7 @@
           "git": {
             "url": "https://github.com/DFHack/dfhack.git",
             "revision": "53.14-r2",
-            "outputHash": "sha256-UOmp84VoY/pam99T2ktAYH3N3cFMSIb9v8KOTZCof8U="
+            "outputHash": "sha256-8OvJ8NULgfR+S0kzOSmQvplhPT7wcxw02sRkG450ptE="
           },
           "xmlRev": "01aae95cacd98850e4f477c45a4b75f800bacecc"
         }