diff options
| author | Naïm Favier <n@monade.li> | 2023-01-26 10:08:59 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2023-01-26 11:54:00 +0100 |
| commit | e722b101f47288f2a7c48a6a711f69536f5dbaa1 (patch) | |
| tree | 70ba98b327d8d9f898416027d0bf64edfb4f073c /pkgs/games/ddnet | |
| parent | 838857d11a3e7ad46c413e9ec24375d483b1c210 (diff) | |
| download | nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar.gz nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar.bz2 nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar.lz nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar.xz nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.tar.zst nixlib-e722b101f47288f2a7c48a6a711f69536f5dbaa1.zip | |
ddnet: 16.5 -> 16.7.2
Adds a build dependency on Rust. Also enable the tests and add me as maintainer.
Diffstat (limited to 'pkgs/games/ddnet')
| -rw-r--r-- | pkgs/games/ddnet/default.nix | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 4a1cbf08c534..3a70213bf889 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -4,6 +4,7 @@ , cmake , ninja , pkg-config +, rustPlatform , curl , freetype , libGLU @@ -22,6 +23,7 @@ , vulkan-loader , glslang , spirv-tools +, gtest , Carbon , Cocoa , OpenGL @@ -30,16 +32,33 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.5"; + version = "16.7.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-fHe72ew+qoSyOqXU9Hs9EyecrYDjEqTm+Ii9Zja9up4="; + hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustPlatform.rust.rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ + gtest + ]; buildInputs = [ curl @@ -62,15 +81,18 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - cmakeFlags = [ - "-DAUTOUPDATE=OFF" - ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ ''; + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + ]; + + doCheck = true; + checkTarget = "run_tests"; + meta = with lib; { description = "A Teeworlds modification with a unique cooperative gameplay."; longDescription = '' @@ -82,9 +104,10 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.org"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju lom ]; + maintainers = with maintainers; [ sirseruju lom ncfavier ]; mainProgram = "DDNet"; # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + # https://github.com/ddnet/ddnet/pull/5913 broken = stdenv.isDarwin; }; } |