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" } 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