Merge pull request #219844 from ncfavier/ddnet

ddnet: 16.7.2 -> 16.8
This commit is contained in:
Naïm Favier 2023-03-06 17:25:05 +01:00 committed by GitHub
commit b7f6070e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -33,19 +33,19 @@
stdenv.mkDerivation rec {
pname = "ddnet";
version = "16.7.2";
version = "16.8";
src = fetchFromGitHub {
owner = "ddnet";
repo = pname;
rev = version;
hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc=";
hash = "sha256-QhRJJQ87WMsf2yTac2lDRj7B+mTaw2r+RProUr+3zoo=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74=";
hash = "sha256-36Afg0Tsf1/dGhZhd5tbxjMX4dKHqGEhIXS4Lal/rXI=";
};
nativeBuildInputs = [
@ -82,15 +82,6 @@ stdenv.mkDerivation rec {
spirv-tools
] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ];
patches = [
(fetchpatch {
# error: use of undeclared identifier 'pthread_attr_set_qos_class_np'
# https://github.com/ddnet/ddnet/pull/5913
url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch";
hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs=";
})
];
postPatch = ''
substituteInPlace src/engine/shared/storage.cpp \
--replace /usr/ $out/