diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 0a88c91e8a84..03388ae289e1 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,23 +1,24 @@ -{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg -, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net -, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip -, alephone }: +{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU +, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config +, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper +, makeDesktopItem, unzip, alephone }: let self = stdenv.mkDerivation rec { outputs = [ "out" "icons" ]; pname = "alephone"; - version = "1.4"; + version = "1.6.1"; src = fetchurl { - url = let date = "20210408"; + url = let date = "20230119"; in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2"; - sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA="; + sha256 = "sha256-rC9RfWUolsKjKGsJaGj0PaO+J4HNF/gQhd56XapcMCY="; }; nativeBuildInputs = [ pkg-config icoutils ]; buildInputs = [ + alsa-lib boost curl ffmpeg_4 @@ -28,17 +29,17 @@ let libpng libvorbis lua + miniupnpc SDL2 SDL2_image SDL2_net SDL2_ttf - smpeg speex zziplib zlib ]; - configureFlags = [ "--with-boost=${boost}" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; makeFlags = [ "AR:=$(AR)" ]; enableParallelBuilding = true; diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/games/alephone/durandal/default.nix index cd5450d1c2e4..cd7927d69a14 100644 --- a/pkgs/games/alephone/durandal/default.nix +++ b/pkgs/games/alephone/durandal/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "durandal"; desktopName = "Marathon-Durandal"; - version = "20150620"; + version = "20230119"; icon = alephone.icons + "/marathon2.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip"; - sha256 = "1gpg0dk3z8irvdkm4nj71v14lqx77109chqr2ly594jqf6j9wwqv"; + sha256 = "sha256-Vbfk5wLgvNEZW2BohMY5mPXaRbNlHxJdWLYTsE8CSwI="; }; meta = { @@ -18,7 +18,7 @@ alephone.makeWrapper rec { Fresh from your triumph on the starship Marathon, you are seized by the rogue computer Durandal to do his bidding in a distant part of the galaxy. Within the ruins of an ancient civilization, you must seek the remnants of a lost clan and uncover their long-buried secrets. Battle opponents ancient and terrible, with sophisticated weapons and devious strategies, all the while struggling to escape the alien nightmare… This release of Marathon 2: Durandal includes the classic graphics, and revamped high-definition textures and monsters from the Xbox Live Arcade edition. - ''; + ''; homepage = "https://alephone.lhowon.org/games/marathon2.html"; }; diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix index 463915314adc..c49f9a8d2ac7 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20220115"; + version = "20230119"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "sha256-00Wp+y+b82uZZ8fNeU3N5UAKlk0Sd1SfAEGL6RpyVf8="; + sha256 = "sha256-0+xokhzWdXM+L4DBjWnfNVXZve4n1X/Aq6rxNGAFb3Q="; }; meta = { diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index e30a29695a8a..ea295b7dcdce 100644 --- a/pkgs/games/alephone/marathon/default.nix +++ b/pkgs/games/alephone/marathon/default.nix @@ -3,12 +3,13 @@ alephone.makeWrapper rec { pname = "marathon"; desktopName = "Marathon"; - version = "20210408"; + version = "20230119"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { - url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg="; + url = + "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; + sha256 = "sha256-uz/1ZW9epd1HP/pzTNN3d2EEbOzjj0qpdMkrVoxb8Aw="; }; meta = {