public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #84261 from catern/cdda

Browse Source 
cataclysm-dda: 0.D -> 0.E
This commit is contained in:
worldofpeace 2020-04-20 08:05:48 -04:00 committed by GitHub
commit 55dcf622ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/games/cataclysm-dda/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, lua, CoreFoundation { stdenv, callPackage, CoreFoundation
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
}: }:
@ -9,28 +9,16 @@ let
in in
stdenv.mkDerivation (common // rec { stdenv.mkDerivation (common // rec {
version = "0.D"; version = "0.E";
name = "cataclysm-dda-${version}"; name = "cataclysm-dda-${version}";
src = fetchFromCleverRaven { src = fetchFromCleverRaven {
rev = version; rev = version;
sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; sha256 = "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan";
}; };
buildInputs = common.buildInputs ++ [ lua ];
patches = [ ./patches/fix_locale_dir.patch ]; patches = [ ./patches/fix_locale_dir.patch ];
postPatch = common.postPatch + ''
substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share"
'';
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy";
makeFlags = common.makeFlags ++ [
"LUA=1"
];
meta = with stdenv.lib.maintainers; common.meta // { meta = with stdenv.lib.maintainers; common.meta // {
maintainers = common.meta.maintainers ++ [ skeidel ]; maintainers = common.meta.maintainers ++ [ skeidel ];
}; };

12
pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch
View File

@ -1,15 +1,13 @@
diff --git a/src/translations.cpp b/src/translations.cpp
index 2585b7ec56..7bb005823c 100644
--- a/src/translations.cpp --- a/src/translations.cpp
+++ b/src/translations.cpp +++ b/src/translations.cpp
@@ -195,14 +195,12 @@ void set_language() @@ -212,14 +212,12 @@ void set_language()
auto env = getenv( "LANGUAGE" ); auto env = getenv( "LANGUAGE" );
locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) +
"/LC_MESSAGES/cataclysm-dda.mo" ); "/LC_MESSAGES/cataclysm-dda.mo" );
-#elif (defined __linux__ || (defined MACOSX && !defined TILES)) -#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))
+#else +#else
if( !FILENAMES["base_path"].empty() ) { if( !PATH_INFO::base_path().empty() ) {
locale_dir = FILENAMES["base_path"] + "share/locale"; locale_dir = PATH_INFO::base_path() + "share/locale";
} else { } else {
locale_dir = "lang/mo"; locale_dir = "lang/mo";
} }