colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frogatto: unstable-2020-12-04 -> unstable-2023-02-27

Browse Source
This commit is contained in:
Astro 2023-02-28 22:35:46 +01:00
parent 0d34707255
commit bdfb775fbe
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/games/frogatto/data.nix
View File

@ -2,18 +2,18 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "frogatto-data"; pname = "frogatto-data";
version = "unstable-2022-04-13"; version = "unstable-2023-02-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "frogatto"; owner = "frogatto";
repo = "frogatto"; repo = "frogatto";
rev = "655493961c4ad57ba9cccdc24d23a2ded294b5f2"; rev = "5ca339f4b97e5004dc07394407bf1da43fbd6204";
sha256 = "0irn7p61cs8nm7dxsx84b2c3wryf2h12k2kclywdhy6xmh53w8k1"; sha256 = "sha256-6wqCFc7DlDt0u0JnPg4amVemc9HOjsB/U4s9n7N84QA=";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/share/frogatto/modules mkdir -p $out/share/frogatto/modules
cp -ar . $out/share/frogatto/modules/frogatto cp -ar . $out/share/frogatto/modules/frogatto4
''; '';
meta = with lib; { meta = with lib; {

2
pkgs/games/frogatto/default.nix
View File

@ -14,7 +14,7 @@ let
genericName = "frogatto"; genericName = "frogatto";
categories = [ "Game" "ArcadeGame" ]; categories = [ "Game" "ArcadeGame" ];
}; };
version = "unstable-2020-12-04"; inherit (data) version;
in buildEnv { in buildEnv {
name = "frogatto-${version}"; name = "frogatto-${version}";

17
pkgs/games/frogatto/engine.nix
View File

@ -1,25 +1,19 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, which { lib, stdenv, fetchFromGitHub, fetchurl, which
, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , 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 { stdenv.mkDerivation {
pname = "anura-engine"; pname = "anura-engine";
version = "unstable-2022-04-09"; version = "unstable-2023-02-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anura-engine"; owner = "anura-engine";
repo = "anura"; repo = "anura";
rev = "5ac7f6fe63114274f0da7dad4c1ed673651e6424"; rev = "65d85b6646099db1d5cd25d31321bb434a3f94f1";
sha256 = "1yrcbvzgxdvn893qk1qcpb53pjns366fdls5qjal7lhq71kkfc67"; sha256 = "sha256-hb4Sn7uI+eXLaGb4zkEy4w+ByQJ6FqkoMUYFsyiFCeE=";
fetchSubmodules = true; 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 = [ nativeBuildInputs = [
which pkg-config which pkg-config
@ -36,6 +30,7 @@ stdenv.mkDerivation {
icu icu
cairo cairo
libvpx libvpx
glm
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;