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
This commit is contained in:
parent
c6d3ed40ac
commit
7eccc156c1
|
@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"PREFIX=$(out)" "LANGUAGES=all" "RUNTESTS=0"
|
"PREFIX=$(out)" "LANGUAGES=all"
|
||||||
(if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
|
(if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1")
|
||||||
] ++ optionals (!debug) [
|
] ++ optionals (!debug) [
|
||||||
"RELEASE=1"
|
"RELEASE=1"
|
||||||
|
|
|
@ -24,7 +24,7 @@ let
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Unconditionally look for translation files in $out/share/locale
|
# Unconditionally look for translation files in $out/share/locale
|
||||||
./locale-path-git.patch
|
./locale-path.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = common.makeFlags ++ [
|
makeFlags = common.makeFlags ++ [
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
diff --git a/src/translations.cpp b/src/translations.cpp
|
|
||||||
index fa0ee479b2..0e470098dc 100644
|
|
||||||
--- a/src/translations.cpp
|
|
||||||
+++ b/src/translations.cpp
|
|
||||||
@@ -141,15 +141,11 @@ void select_language()
|
|
||||||
std::string locale_dir()
|
|
||||||
{
|
|
||||||
std::string loc_dir;
|
|
||||||
-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES))))
|
|
||||||
if( !PATH_INFO::base_path().empty() ) {
|
|
||||||
loc_dir = PATH_INFO::base_path() + "share/locale";
|
|
||||||
} else {
|
|
||||||
loc_dir = PATH_INFO::langdir();
|
|
||||||
}
|
|
||||||
-#else
|
|
||||||
- loc_dir = PATH_INFO::langdir();
|
|
||||||
-#endif
|
|
||||||
return loc_dir;
|
|
||||||
}
|
|
||||||
|
|
|
@ -18,25 +18,18 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
self = common.overrideAttrs (common: rec {
|
self = common.overrideAttrs (common: rec {
|
||||||
version = "0.F-3";
|
version = "0.G";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CleverRaven";
|
owner = "CleverRaven";
|
||||||
repo = "Cataclysm-DDA";
|
repo = "Cataclysm-DDA";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-2su1uQaWl9WG41207dRvOTdVKcQsEz/y0uTi9JX52uI=";
|
sha256 = "sha256-Hda0dVVHNeZ8MV5CaCbSpdOCG2iqQEEmXdh16vwIBXk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Unconditionally look for translation files in $out/share/locale
|
# Unconditionally look for translation files in $out/share/locale
|
||||||
./locale-path-stable.patch
|
./locale-path.patch
|
||||||
|
|
||||||
# Fixes compiler errors when compiling against SDL2_ttf >= 1.20.0, https://github.com/CleverRaven/Cataclysm-DDA/pull/59083
|
|
||||||
# Remove with next version update.
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/CleverRaven/Cataclysm-DDA/commit/625fadf3d493c1712d9ade2b849ff6a79765c7a7.patch";
|
|
||||||
hash = "sha256-c0NXkd6jSGSruKrwuYUmLbgiL97YQDkUm313fnMJ7GA=";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = common.makeFlags ++ [
|
makeFlags = common.makeFlags ++ [
|
||||||
|
@ -52,6 +45,7 @@ let
|
||||||
meta = common.meta // {
|
meta = common.meta // {
|
||||||
maintainers = with lib.maintainers;
|
maintainers = with lib.maintainers;
|
||||||
common.meta.maintainers ++ [ skeidel ];
|
common.meta.maintainers ++ [ skeidel ];
|
||||||
|
changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue