Merge pull request #219047 from DeeUnderscore/update/cataclysm-dda-0.G

cataclysm-dda: 0.F-3 -> 0.G

5 files changed, 6 insertions, 32 deletions

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 4e39a64c400..41579b52710 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = [
-    "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0"
+    "PREFIX=$(out)" "LANGUAGES=all"
     (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
   ] ++ optionals (!debug) [
     "RELEASE=1"
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index 21a7c66dbba..c7090838b86 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -24,7 +24,7 @@ let
 
     patches = [
       # Unconditionally look for translation files in $out/share/locale
-      ./locale-path-git.patch
+      ./locale-path.patch
     ];
 
     makeFlags = common.makeFlags ++ [
diff --git a/pkgs/games/cataclysm-dda/locale-path-stable.patch b/pkgs/games/cataclysm-dda/locale-path-stable.patch
deleted file mode 100644
index db8592646f0..00000000000
--- a/pkgs/games/cataclysm-dda/locale-path-stable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/translations.cpp b/src/translations.cpp
-index fa0ee479b2..0e470098dc 100644
---- a/src/translations.cpp
-+++ b/src/translations.cpp
-@@ -141,15 +141,11 @@ void select_language()
- std::string locale_dir()
- {
-     std::string loc_dir;
--#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES))))
-     if( !PATH_INFO::base_path().empty() ) {
-         loc_dir = PATH_INFO::base_path() + "share/locale";
-     } else {
-         loc_dir = PATH_INFO::langdir();
-     }
--#else
--    loc_dir = PATH_INFO::langdir();
--#endif
-     return loc_dir;
- }
- 
diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/games/cataclysm-dda/locale-path.patch
index 03f103a548f..03f103a548f 100644
--- a/pkgs/games/cataclysm-dda/locale-path-git.patch
+++ b/pkgs/games/cataclysm-dda/locale-path.patch
diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix
index 9d5c865ab48..e24432a25bb 100644
--- a/pkgs/games/cataclysm-dda/stable.nix
+++ b/pkgs/games/cataclysm-dda/stable.nix
@@ -18,25 +18,18 @@ let
   };
 
   self = common.overrideAttrs (common: rec {
-    version = "0.F-3";
+    version = "0.G";
 
     src = fetchFromGitHub {
       owner = "CleverRaven";
       repo = "Cataclysm-DDA";
       rev = version;
-      sha256 = "sha256-2su1uQaWl9WG41207dRvOTdVKcQsEz/y0uTi9JX52uI=";
+      sha256 = "sha256-Hda0dVVHNeZ8MV5CaCbSpdOCG2iqQEEmXdh16vwIBXk=";
     };
 
     patches = [
       # Unconditionally look for translation files in $out/share/locale
-      ./locale-path-stable.patch
-
-      # Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083
-      # Remove with next version update.
-      (fetchpatch {
-        url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch";
-        hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA=";
-      })
+      ./locale-path.patch
     ];
 
     makeFlags = common.makeFlags ++ [
@@ -52,6 +45,7 @@ let
     meta = common.meta // {
       maintainers = with lib.maintainers;
         common.meta.maintainers ++ [ skeidel ];
+      changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt";
     };
   });
 in