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

Release announcement: https://cataclysmdda.org/releases/#0g-gaiman
Changelog: https://github.com/CleverRaven/Cataclysm-DDA/blob/0.G/data/changelog.txt

+6 -32
+1 -1
pkgs/games/cataclysm-dda/common.nix
··· 44 ''; 45 46 makeFlags = [ 47 - "PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0" 48 (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") 49 ] ++ optionals (!debug) [ 50 "RELEASE=1"
··· 44 ''; 45 46 makeFlags = [ 47 + "PREFIX=$(out)" "LANGUAGES=all" 48 (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") 49 ] ++ optionals (!debug) [ 50 "RELEASE=1"
+1 -1
pkgs/games/cataclysm-dda/git.nix
··· 24 25 patches = [ 26 # Unconditionally look for translation files in $out/share/locale 27 - ./locale-path-git.patch 28 ]; 29 30 makeFlags = common.makeFlags ++ [
··· 24 25 patches = [ 26 # Unconditionally look for translation files in $out/share/locale 27 + ./locale-path.patch 28 ]; 29 30 makeFlags = common.makeFlags ++ [
pkgs/games/cataclysm-dda/locale-path-git.patch pkgs/games/cataclysm-dda/locale-path.patch
-20
pkgs/games/cataclysm-dda/locale-path-stable.patch
··· 1 - diff --git a/src/translations.cpp b/src/translations.cpp 2 - index fa0ee479b2..0e470098dc 100644 3 - --- a/src/translations.cpp 4 - +++ b/src/translations.cpp 5 - @@ -141,15 +141,11 @@ void select_language() 6 - std::string locale_dir() 7 - { 8 - std::string loc_dir; 9 - -#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES)))) 10 - if( !PATH_INFO::base_path().empty() ) { 11 - loc_dir = PATH_INFO::base_path() + "share/locale"; 12 - } else { 13 - loc_dir = PATH_INFO::langdir(); 14 - } 15 - -#else 16 - - loc_dir = PATH_INFO::langdir(); 17 - -#endif 18 - return loc_dir; 19 - } 20 -
···
+4 -10
pkgs/games/cataclysm-dda/stable.nix
··· 18 }; 19 20 self = common.overrideAttrs (common: rec { 21 - version = "0.F-3"; 22 23 src = fetchFromGitHub { 24 owner = "CleverRaven"; 25 repo = "Cataclysm-DDA"; 26 rev = version; 27 - sha256 = "sha256-2su1uQaWl9WG41207dRvOTdVKcQsEz/y0uTi9JX52uI="; 28 }; 29 30 patches = [ 31 # Unconditionally look for translation files in $out/share/locale 32 - ./locale-path-stable.patch 33 - 34 - # Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083 35 - # Remove with next version update. 36 - (fetchpatch { 37 - url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch"; 38 - hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA="; 39 - }) 40 ]; 41 42 makeFlags = common.makeFlags ++ [ ··· 52 meta = common.meta // { 53 maintainers = with lib.maintainers; 54 common.meta.maintainers ++ [ skeidel ]; 55 }; 56 }); 57 in
··· 18 }; 19 20 self = common.overrideAttrs (common: rec { 21 + version = "0.G"; 22 23 src = fetchFromGitHub { 24 owner = "CleverRaven"; 25 repo = "Cataclysm-DDA"; 26 rev = version; 27 + sha256 = "sha256-Hda0dVVHNeZ8MV5CaCbSpdOCG2iqQEEmXdh16vwIBXk="; 28 }; 29 30 patches = [ 31 # Unconditionally look for translation files in $out/share/locale 32 + ./locale-path.patch 33 ]; 34 35 makeFlags = common.makeFlags ++ [ ··· 45 meta = common.meta // { 46 maintainers = with lib.maintainers; 47 common.meta.maintainers ++ [ skeidel ]; 48 + changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; 49 }; 50 }); 51 in