diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2019-05-03 01:40:17 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2019-05-03 22:40:09 +0900 |
| commit | 520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb (patch) | |
| tree | 8856afd5fc9f4e415044af18e57082461adbbdae /pkgs/games | |
| parent | d8dec0a2332a66e940a876d44c06da044e9c5a76 (diff) | |
| download | nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar.gz nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar.bz2 nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar.lz nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar.xz nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.tar.zst nixlib-520dd5d71e1ccd50d6ef439c1dccbe3d53b6a5eb.zip | |
cataclysm-dda-git: 2018-07-15 -> 2019-05-03
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/cataclysm-dda/git.nix | 10 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index c8f031d31942..189372547ce4 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,5 +1,5 @@ -{ stdenv, callPackage -, tiles ? true, Cocoa, CoreFoundation +{ stdenv, callPackage, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: @@ -10,12 +10,12 @@ let in stdenv.mkDerivation (common // rec { - version = "2018-07-15"; + version = "2019-05-03"; name = "cataclysm-dda-git-${version}"; src = fetchFromCleverRaven { - rev = "e1e5d81"; - sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1"; + rev = "65a05026e7306b5d1228dc6ed885c43447f128b5"; + sha256 = "18yn0h6b4j9lx67sq1d886la3l6l7bqsnwj6mw2khidssiy18y0n"; }; buildInputs = common.buildInputs diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch index c3140af03c8b..1b92c8816614 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch @@ -1,12 +1,13 @@ diff --git a/src/translations.cpp b/src/translations.cpp -index 3a86291..e6c5f84 100644 +index 0068a35785..c8034cbeac 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -176,15 +176,11 @@ void set_language() - - // Step 2. Bind to gettext domain. - std::string locale_dir; --#if (defined __linux__ || (defined MACOSX && !defined TILES)) +@@ -202,14 +202,12 @@ void set_language() + auto env = getenv( "LANGUAGE" ); + locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + "/LC_MESSAGES/cataclysm-dda.mo" ); +-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES))) ++#else if( !FILENAMES["base_path"].empty() ) { locale_dir = FILENAMES["base_path"] + "share/locale"; } else { @@ -14,7 +15,6 @@ index 3a86291..e6c5f84 100644 } -#else - locale_dir = "lang/mo"; --#endif // __linux__ + #endif const char *locale_dir_char = locale_dir.c_str(); - bindtextdomain( "cataclysm-dda", locale_dir_char ); |