alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #74064 from shazow/cdda-git-bump

Browse source 
cataclysm-dda-git: 2019-05-03 -> 2019-11-22
This commit is contained in:
Mario Rodas 2019-12-11 18:38:50 -05:00 committed by GitHub
parent 8af07181d0 5e8770a8bb
commit 98e57f8999
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/games/cataclysm-dda/git.nix
View file

@ -10,15 +10,18 @@ let
in
stdenv.mkDerivation (common // rec {
version = "2019-05-03";
version = "2019-11-22";
name = "cataclysm-dda-git-${version}";
src = fetchFromCleverRaven {
rev = "65a05026e7306b5d1228dc6ed885c43447f128b5";
sha256 = "18yn0h6b4j9lx67sq1d886la3l6l7bqsnwj6mw2khidssiy18y0n";
rev = "a6c8ece992bffeae3788425dd4b3b5871e66a9cd";
sha256 = "0ww2q5gykxm802z1kffmnrfahjlx123j1gfszklpsv0b1fccm1ab";
};
patches = [ ./patches/fix_locale_dir_git.patch ];
patches = [
# Locale patch required for Darwin builds, see: https://github.com/NixOS/nixpkgs/pull/74064#issuecomment-560083970
./patches/fix_locale_dir_git.patch
];
makeFlags = common.makeFlags ++ [
"VERSION=git-${version}-${substring 0 8 src.rev}"

6
pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch
View file

@ -1,8 +1,8 @@
diff --git a/src/translations.cpp b/src/translations.cpp
index 0068a35785..c8034cbeac 100644
index 067e2cd77d..5660d18b3d 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -202,14 +202,12 @@ void set_language()
@@ -211,14 +211,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" );
@ -16,5 +16,5 @@ index 0068a35785..c8034cbeac 100644
-#else
- locale_dir = "lang/mo";
#endif
const char *locale_dir_char = locale_dir.c_str();