diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index aad5eeff5a2..fa00839ea8b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3136,6 +3136,16 @@ githubId = 10198051; name = "Drew Risinger"; }; + drperceptron = { + email = "92106371+drperceptron@users.noreply.github.com"; + github = "drperceptron"; + githubId = 92106371; + name = "Dr Perceptron"; + keys = [{ + longkeyid = "rsa4096/0x95EB6DFF26D1CEB0"; + fingerprint = "7E38 89D9 B1A8 B381 C8DE A15F 95EB 6DFF 26D1 CEB0"; + }]; + }; drupol = { name = "Pol Dellaiera"; email = "pol.dellaiera@protonmail.com"; diff --git a/pkgs/games/tworld2/default.nix b/pkgs/games/tworld2/default.nix new file mode 100644 index 00000000000..1db1dcf5f06 --- /dev/null +++ b/pkgs/games/tworld2/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchurl +, qt4 +, SDL +}: + +stdenv.mkDerivation rec { + pname = "tworld2"; + version = "2.2.0"; + + src = fetchurl { + url = "https://tw2.bitbusters.club/downloads/tworld-${version}-src.tar.gz"; + sha256 = "sha256:1y55v2shk2xxcds7bdwdjaq9lka31sgdp2469zqnvldchwbvcb2i"; + }; + + buildInputs = [ qt4 SDL ]; + enableParallelBuilding = true; + + postConfigure = '' + echo "#define COMPILE_TIME \"$(date -ud "@$SOURCE_DATE_EPOCH" '+%Y %b %e %T %Z')\"" >comptime.h + ''; + + makeFlags = [ + "bindir=${placeholder "out"}/bin" + "sharedir=${placeholder "out"}/share" + "mandir=${placeholder "out"}/share/man/en" + ]; + + postInstall = '' + mkdir -p $out/share/doc/${pname} + cp COPYING README docs/tworld2.html $out/share/doc/${pname} + + mkdir $out/share/icons + cp tworld.ico tworld2.ico $out/share/icons + ''; + + meta = with lib; { + description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge"; + homepage = "https://tw2.bitbusters.club/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ drperceptron ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cdcff55897..69c1c79e10d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31101,6 +31101,8 @@ with pkgs; tuxtype = callPackage ../games/tuxtype { }; + tworld2 = callPackage ../games/tworld2 { }; + speed_dreams = callPackage ../games/speed-dreams { # Torcs wants to make shared libraries linked with plib libraries (it provides static). # i686 is the only platform I know than can do that linking without plib built with -fPIC