From 982ffc81758167705f08f073ae1fe85002345bdd Mon Sep 17 00:00:00 2001 From: Seruju Date: Sat, 16 Oct 2021 01:22:36 +0300 Subject: [PATCH 1/2] maintainers: add sirseruju --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 15de9bc00b44..8de081543603 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10400,6 +10400,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sirseruju = { + email = "sir.seruju@yandex.ru"; + github = "sirseruju"; + githubId = 74881555; + name = "Fofanov Sergey"; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; From 9889c07eb3c6919eb1f71fbbd871e5166aa71ec4 Mon Sep 17 00:00:00 2001 From: Seruju Date: Sat, 16 Oct 2021 13:03:18 +0300 Subject: [PATCH 2/2] ddnet: init at 15.5.4 --- pkgs/games/ddnet/default.nix | 74 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/games/ddnet/default.nix diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix new file mode 100644 index 000000000000..51a242a6cfdf --- /dev/null +++ b/pkgs/games/ddnet/default.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, curl +, freetype +, libGLU +, libnotify +, libogg +, libX11 +, opusfile +, pcre +, python3 +, SDL2 +, sqlite +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "ddnet"; + version = "15.5.4"; + + src = fetchFromGitHub { + owner = "ddnet"; + repo = pname; + rev = version; + sha256 = "sha256-vJMYPaLK2CK+nbojLstXgxqIUaf7jNynpklFgtIpvGM="; + }; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + + buildInputs = [ + curl + freetype + libGLU + libnotify + libogg + libX11 + opusfile + pcre + python3 + SDL2 + sqlite + wavpack + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DAUTOUPDATE=OFF" + "-GNinja" + ]; + + postPatch = '' + substituteInPlace src/engine/shared/storage.cpp \ + --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "A Teeworlds modification with a unique cooperative gameplay."; + longDescription = '' + DDraceNetwork (DDNet) is an actively maintained version of DDRace, + a Teeworlds modification with a unique cooperative gameplay. + Help each other play through custom maps with up to 64 players, + compete against the best in international tournaments, + design your own maps, or run your own server. + ''; + homepage = "https://ddnet.tw"; + license = licenses.asl20; + maintainers = with maintainers; [ sirseruju legendofmiracles ]; + mainProgram = "DDNet"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19c0e62ca19..5d3647fce230 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29525,6 +29525,8 @@ with pkgs; inherit (import ../games/deliantra pkgs) deliantra-server deliantra-arch deliantra-maps deliantra-data; + ddnet = callPackage ../games/ddnet { }; + devilutionx = callPackage ../games/devilutionx {}; dhewm3 = callPackage ../games/dhewm3 {};