diff options
author | Naïm Favier <n@monade.li> | 2024-06-26 15:31:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-26 15:31:39 +0200 |
commit | 379aaf8a882ce8b3d74d079ea48e72e88245d59c (patch) | |
tree | de1348433befcee8fa884a11cb7fb401c9bbf6fa /pkgs | |
parent | aaa950d4f20622b00dbab53bf7b26c3d9a34939a (diff) | |
parent | 82e0c944494d133a8a5cbee384028270f37e0271 (diff) |
Merge pull request #322602 from ncfavier/ddnet
ddnet: 18.2 -> 18.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/ddnet/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 87ce27e96bffc..955baea28be85 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cargo , cmake , ninja @@ -35,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.2"; + version = "18.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-KerV174GPF2htfaQo5gRFLgpnGf9UoS0zQ/yd/SDFkQ="; + hash = "sha256-QefbA6ncxMDHmd7tBH1bU+8FoVVJVdEtOuVXEvteSOE="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg="; + hash = "sha256-XwSdDvE0p/A+6ZbV82K78jgIxGs71fu7ZDGTl0I0cCI="; }; nativeBuildInputs = [ @@ -91,6 +92,13 @@ stdenv.mkDerivation rec { Security ]); + patches = [ + (fetchpatch { + url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; + hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; + }) + ]; + postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ |