diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-12-11 18:38:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 18:38:50 -0500 |
| commit | 98e57f8999cc88e3d4b2250adef51747ade5105e (patch) | |
| tree | 23e0ceb98063aed69c6d5f671dd40d81b4aba6c0 /pkgs/games | |
| parent | 8af07181d05e9aff10558847f92bdb9aea18d322 (diff) | |
| parent | 5e8770a8bb077e6e8dd32a2cdbf766d13bb85981 (diff) | |
| download | nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar.gz nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar.bz2 nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar.lz nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar.xz nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.tar.zst nixpkgs-98e57f8999cc88e3d4b2250adef51747ade5105e.zip | |
Merge pull request #74064 from shazow/cdda-git-bump
cataclysm-dda-git: 2019-05-03 -> 2019-11-22
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/cataclysm-dda/git.nix | 11 | ||||
| -rw-r--r-- | pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index b872e95d589..8e3c3e33994 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -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}" 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 1b92c881661..79b442ff5c9 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir_git.patch @@ -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(); |