Skip to content

Commit d6c56af

Browse files
committed
taterclient-ddnet: 10.1.2 -> 10.3.0
1 parent 5cfc424 commit d6c56af

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
2+
index ab70b3c..9e25353 100644
3+
--- a/src/engine/client/client.cpp.orig
4+
+++ b/src/engine/client/client.cpp
5+
@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
6+
{
7+
char aError[2048];
8+
snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
9+
- log_error("client", aError);
10+
+ log_error("client", "%s", aError);
11+
pClient->ShowMessageBox("Config File Error", aError);
12+
PerformAllCleanup();
13+
return -1;

pkgs/by-name/ta/taterclient-ddnet/package.nix

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,20 @@
2626
vulkan-loader,
2727
glslang,
2828
spirv-tools,
29-
gtest,
3029
glew,
3130
}:
3231
let
3332
clientExecutable = "TaterClient-DDNet";
3433
in
3534
stdenv.mkDerivation (finalAttrs: {
3635
pname = "taterclient-ddnet";
37-
version = "10.1.2";
36+
version = "10.3.0";
3837

3938
src = fetchFromGitHub {
4039
owner = "sjrc6";
4140
repo = "taterclient-ddnet";
4241
tag = "V${finalAttrs.version}";
43-
hash = "sha256-0N4nzGcmHrWkIFHEREtSBCTHPBE4UI8RmCuRsehX1YU=";
42+
hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
4443
};
4544

4645
cargoDeps = rustPlatform.fetchCargoVendor {
@@ -59,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
5958
python3
6059
];
6160

62-
nativeCheckInputs = [ gtest ];
63-
checkInputs = [ gtest ];
64-
6561
buildInputs = [
6662
curl
6763
libnotify
@@ -84,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
8480

8581
strictDeps = true;
8682

83+
patches = [
84+
./client_log_format_security.patch
85+
];
86+
8787
postPatch = ''
8888
substituteInPlace src/engine/shared/storage.cpp \
8989
--replace-fail /usr/ $out/
@@ -98,10 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
9898
(lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
9999
];
100100

101-
doCheck = true;
102-
checkTarget = "run_tests";
103-
104-
__darwinAllowLocalNetworking = true; # for tests
101+
# Since we are not building the server executable, the `run_tests` Makefile target
102+
# will not be generated.
103+
#
104+
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
105+
doCheck = false;
105106

106107
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
107108
# Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet

0 commit comments

Comments
 (0)