From f62f2fd3dc081194f415579e6693f108bbe8eca9 Mon Sep 17 00:00:00 2001 From: Sterling Stein Date: Fri, 19 Jul 2019 22:44:20 -0700 Subject: [PATCH 1/2] maintainers: add scubed2 --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8f3a692b684..cbdbb7eb1f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4601,6 +4601,11 @@ github = "scriptkiddi"; name = "Fritz Otlinghaus"; }; + scubed2 = { + email = "scubed2@gmail.com"; + github = "scubed2"; + name = "Sterling Stein"; + }; sdll = { email = "sasha.delly@gmail.com"; github = "sdll"; From e0c2e7f65f196fa91543304505d92d41840ff7fc Mon Sep 17 00:00:00 2001 From: Sterling Stein Date: Fri, 19 Jul 2019 22:52:07 -0700 Subject: [PATCH 2/2] nxengine-evo: init at 2.6.4 --- pkgs/games/nxengine-evo/default.nix | 65 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/games/nxengine-evo/default.nix diff --git a/pkgs/games/nxengine-evo/default.nix b/pkgs/games/nxengine-evo/default.nix new file mode 100644 index 00000000000..909737a6804 --- /dev/null +++ b/pkgs/games/nxengine-evo/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchpatch +, fetchurl +, cmake +, libpng +, SDL2 +, SDL2_mixer +}: + +stdenv.mkDerivation rec { + pname = "nxengine-evo"; + version = "2.6.4"; + src = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/archive/v${version}.tar.gz"; + sha256 = "1xir74l0vrzrpyl7sfqfxp083dakbix26hd0arwf2y57w1mbjas8"; + }; + assets = fetchurl { + url = "https://github.com/nxengine/nxengine-evo/releases/download/v${version}/NXEngine-v${version}-Linux.tar.xz"; + sha256 = "1b5hkmsrrhnjjf825ri6n62kb3fldwl7v5f1cqvqyv47zv15g5gy"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch"; + sha256 = "18j22vzkikcwqd42vlhzd6rjp26dq0zslxw5yyl07flivms0hny2"; + }) + (fetchpatch { + url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch"; + sha256 = "0sjr7z63gp7nfxifxisvp2w664mxxk3xi4a3d86mm0470dj5m5bx"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libpng + SDL2 + SDL2_mixer + ]; + + # Allow finding game assets. + postPatch = '' + sed -i -e "s,/usr/share/,$out/share/," src/ResourceManager.cpp + ''; + + installPhase = '' + cd .. + unpackFile ${assets} + mkdir -p $out/bin/ $out/share/nxengine/ + install bin/* $out/bin/ + cp -r NXEngine-evo-${version}-Linux/data/ $out/share/nxengine/data + chmod -R a=r,a+X $out/share/nxengine/data + ''; + + meta = { + description = "A complete open-source clone/rewrite of the masterpiece jump-and-run platformer Doukutsu Monogatari (also known as Cave Story)"; + license = with stdenv.lib.licenses; [ + gpl3 # Game engine + unfreeRedistributable # Game assets, freeware + ]; + maintainers = [ stdenv.lib.maintainers.scubed2 ]; + homepage = "https://github.com/nxengine/nxengine-evo"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c437ee3fd42..740c04c28ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21729,6 +21729,8 @@ in newtonwars = callPackage ../games/newtonwars { }; + nxengine-evo = callPackage ../games/nxengine-evo { }; + odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { };