diff options
author | Astro <astro@spaceboyz.net> | 2023-02-28 22:35:46 +0100 |
---|---|---|
committer | Astro <astro@spaceboyz.net> | 2023-02-28 22:35:46 +0100 |
commit | bdfb775fbe0df86e7fe4ba7c46a42e86e81116cd (patch) | |
tree | 17666936aa3dacf8fe280631a63459369581880c /pkgs/games/frogatto | |
parent | 0d34707255838ad0823af62405d9df02b4f3e2fb (diff) |
frogatto: unstable-2020-12-04 -> unstable-2023-02-27
Diffstat (limited to 'pkgs/games/frogatto')
-rw-r--r-- | pkgs/games/frogatto/data.nix | 8 | ||||
-rw-r--r-- | pkgs/games/frogatto/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/frogatto/engine.nix | 17 |
3 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 00e43582f6e1f..a61bddf94bfb5 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation { pname = "frogatto-data"; - version = "unstable-2022-04-13"; + version = "unstable-2023-02-27"; src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - rev = "655493961c4ad57ba9cccdc24d23a2ded294b5f2"; - sha256 = "0irn7p61cs8nm7dxsx84b2c3wryf2h12k2kclywdhy6xmh53w8k1"; + rev = "5ca339f4b97e5004dc07394407bf1da43fbd6204"; + sha256 = "sha256-6wqCFc7DlDt0u0JnPg4amVemc9HOjsB/U4s9n7N84QA="; }; installPhase = '' mkdir -p $out/share/frogatto/modules - cp -ar . $out/share/frogatto/modules/frogatto + cp -ar . $out/share/frogatto/modules/frogatto4 ''; meta = with lib; { diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index e141b68e88d30..036b2abec19ca 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -14,7 +14,7 @@ let genericName = "frogatto"; categories = [ "Game" "ArcadeGame" ]; }; - version = "unstable-2020-12-04"; + inherit (data) version; in buildEnv { name = "frogatto-${version}"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index b848c414b7a3c..95e2135660fdb 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,25 +1,19 @@ { lib, stdenv, fetchFromGitHub, fetchurl, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf -, glew, zlib, icu, pkg-config, cairo, libvpx }: +, glew, zlib, icu, pkg-config, cairo, libvpx, glm +}: stdenv.mkDerivation { pname = "anura-engine"; - version = "unstable-2022-04-09"; + version = "unstable-2023-02-27"; src = fetchFromGitHub { owner = "anura-engine"; repo = "anura"; - rev = "5ac7f6fe63114274f0da7dad4c1ed673651e6424"; - sha256 = "1yrcbvzgxdvn893qk1qcpb53pjns366fdls5qjal7lhq71kkfc67"; + rev = "65d85b6646099db1d5cd25d31321bb434a3f94f1"; + sha256 = "sha256-hb4Sn7uI+eXLaGb4zkEy4w+ByQJ6FqkoMUYFsyiFCeE="; fetchSubmodules = true; }; - patches = [ - # https://github.com/anura-engine/anura/issues/321 - (fetchurl { - url = "https://github.com/anura-engine/anura/commit/627d08fb5254b5c66d315f1706089905c2704059.patch"; - sha256 = "052m58qb3lg0hnxacpnjz2sz89dk0x6b5qi2q9bkzkvg38f237rr"; - }) - ]; nativeBuildInputs = [ which pkg-config @@ -36,6 +30,7 @@ stdenv.mkDerivation { icu cairo libvpx + glm ]; enableParallelBuilding = true; |