mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 03:23:29 +03:00
taterclient-ddnet: 10.1.2 -> 10.3.0
This commit is contained in:
parent
5cfc4245bf
commit
d6c56af513
2 changed files with 24 additions and 10 deletions
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/src/engine/client/client.cpp.orig b/src/engine/client/client.cpp
|
||||||
|
index ab70b3c..9e25353 100644
|
||||||
|
--- a/src/engine/client/client.cpp.orig
|
||||||
|
+++ b/src/engine/client/client.cpp
|
||||||
|
@@ -4933,7 +4933,7 @@ int main(int argc, const char **argv)
|
||||||
|
{
|
||||||
|
char aError[2048];
|
||||||
|
snprintf(aError, sizeof(aError), "Failed to load config from '%s'.", s_aConfigDomains[ConfigDomain].m_aConfigPath);
|
||||||
|
- log_error("client", aError);
|
||||||
|
+ log_error("client", "%s", aError);
|
||||||
|
pClient->ShowMessageBox("Config File Error", aError);
|
||||||
|
PerformAllCleanup();
|
||||||
|
return -1;
|
|
@ -26,7 +26,6 @@
|
||||||
vulkan-loader,
|
vulkan-loader,
|
||||||
glslang,
|
glslang,
|
||||||
spirv-tools,
|
spirv-tools,
|
||||||
gtest,
|
|
||||||
glew,
|
glew,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
@ -34,13 +33,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "taterclient-ddnet";
|
pname = "taterclient-ddnet";
|
||||||
version = "10.1.2";
|
version = "10.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sjrc6";
|
owner = "sjrc6";
|
||||||
repo = "taterclient-ddnet";
|
repo = "taterclient-ddnet";
|
||||||
tag = "V${finalAttrs.version}";
|
tag = "V${finalAttrs.version}";
|
||||||
hash = "sha256-0N4nzGcmHrWkIFHEREtSBCTHPBE4UI8RmCuRsehX1YU=";
|
hash = "sha256-OEoiUtD87xsXBgAZ65mmfmAJcEvrley3drRX+IJo20s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||||
|
@ -59,9 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
python3
|
python3
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [ gtest ];
|
|
||||||
checkInputs = [ gtest ];
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
libnotify
|
libnotify
|
||||||
|
@ -84,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./client_log_format_security.patch
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace src/engine/shared/storage.cpp \
|
substituteInPlace src/engine/shared/storage.cpp \
|
||||||
--replace-fail /usr/ $out/
|
--replace-fail /usr/ $out/
|
||||||
|
@ -98,10 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||||
(lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
|
(lib.cmakeFeature "CLIENT_EXECUTABLE" clientExecutable)
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = true;
|
# Since we are not building the server executable, the `run_tests` Makefile target
|
||||||
checkTarget = "run_tests";
|
# will not be generated.
|
||||||
|
#
|
||||||
__darwinAllowLocalNetworking = true; # for tests
|
# See https://github.com/sjrc6/TaterClient-ddnet/blob/V10.3.0/CMakeLists.txt#L3072
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||||
# Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet
|
# Upstream links against <prefix>/lib while it installs this library in <prefix>/lib/ddnet
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue