diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-27 06:01:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-27 06:01:14 +0000 |
commit | ac252ffaef85fbc2d132944af9ab3b9f639b215a (patch) | |
tree | 3f8fe1a31842bb575b4fd5376f576c31cc30d009 /pkgs/games | |
parent | 946747effbf10379b125f81ca4f4fec0fd30a2ec (diff) | |
parent | 53e3474e5c8e75e38f0369b968675fc8bbc1e518 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/1oom/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/games/1oom/default.nix b/pkgs/games/1oom/default.nix index 54bfb4d0b3219..487a08f752974 100644 --- a/pkgs/games/1oom/default.nix +++ b/pkgs/games/1oom/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchFromGitLab, autoreconfHook, libsamplerate, SDL2, SDL2_mixer, readline }: +{ lib, stdenv, fetchFromGitHub, gitUpdater, autoreconfHook, allegro, libsamplerate, libX11, libXext, SDL, SDL_mixer, SDL2, SDL2_mixer, readline }: stdenv.mkDerivation rec { pname = "1oom"; - version = "1.0"; + version = "1.8.1"; - src = fetchFromGitLab { - owner = "KilgoreTroutMaskReplicant"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+HwSykSyAGHtITVOu4nIG87kWwVxGyFXb/NRSjhWlvs="; + src = fetchFromGitHub { + owner = "1oom-fork"; + repo = "1oom"; + rev = "refs/tags/f${version}"; + hash = "sha256-sBVcPR4+MDjyOLgrB4VcVy0cDyyG5MVY9vNhWwqAhBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libsamplerate SDL2 SDL2_mixer readline ]; + buildInputs = [ allegro libsamplerate libX11 libXext SDL SDL_mixer SDL2 SDL2_mixer readline ]; outputs = [ "out" "doc" ]; postInstall = '' install -d $doc/share/doc/${pname} install -t $doc/share/doc/${pname} \ - HACKING NEWS PHILOSOPHY README doc/*.txt + HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; + passthru.updateScript = gitUpdater { + rev-prefix = "f"; + }; + meta = with lib; { - homepage = "https://kilgoretroutmaskreplicant.gitlab.io/plain-html/"; - description = "Master of Orion (1993) game engine recreation"; + homepage = "https://github.com/1oom-fork/1oom"; + description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; |