diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-15 00:03:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-15 00:03:21 +0000 |
| commit | 1c0229dbfdacabcffd279cca17007620ace15106 (patch) | |
| tree | 53e605742ade9a843c3298e97c85e336b63239b2 /pkgs/games | |
| parent | 795332a20ee3144225ea8c3e32d0685e60dd1f96 (diff) | |
| parent | faca36d9c0449840485e09a2d2eee6b521408036 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/frogatto/data.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/frogatto/engine.nix | 15 | ||||
| -rw-r--r-- | pkgs/games/mindustry/default.nix | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 3ca955a09c39d..00e43582f6e1f 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation { pname = "frogatto-data"; - version = "unstable-2021-05-24"; + version = "unstable-2022-04-13"; src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - # master branch as of 2021-11-29 - rev = "82d3dafa0cfeaad016a427bdbc729eb9509748f1"; - sha256 = "0fmwn584xl0vafcsh72b4xnryfqyjxk5zhmymg5i8rzp6h03n8xq"; + rev = "655493961c4ad57ba9cccdc24d23a2ded294b5f2"; + sha256 = "0irn7p61cs8nm7dxsx84b2c3wryf2h12k2kclywdhy6xmh53w8k1"; }; installPhase = '' diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 9e8ee6fe8dd86..b848c414b7a3c 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -1,18 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, which +{ lib, stdenv, fetchFromGitHub, fetchurl, which , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkg-config, cairo, libvpx }: stdenv.mkDerivation { pname = "anura-engine"; - version = "unstable-2021-11-23"; + version = "unstable-2022-04-09"; src = fetchFromGitHub { owner = "anura-engine"; repo = "anura"; - rev = "816425df31624066e2815e26a25b1c5d3d355cb4"; - sha256 = "1k7fnfgz003gcbyygv4aakhkkz3w3z9nyz7dlwz01xa6122zqyir"; + rev = "5ac7f6fe63114274f0da7dad4c1ed673651e6424"; + sha256 = "1yrcbvzgxdvn893qk1qcpb53pjns366fdls5qjal7lhq71kkfc67"; 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 diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 82df3710c5770..2572cd60c4a45 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -13,6 +13,7 @@ , stb , ant , alsa-lib +, alsa-plugins , glew # Make the build version easily overridable. @@ -180,7 +181,8 @@ stdenv.mkDerivation rec { install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/mindustry \ - --add-flags "-jar $out/share/mindustry.jar" + --add-flags "-jar $out/share/mindustry.jar" \ + --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/ install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png '' + optionalString enableServer '' install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar |