alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #168559 from astro/frogatto

Browse source 
frogatto: unstable-2021-05-24 -> unstable-2022-04-13
This commit is contained in:
Pascal Bach 2022-04-14 21:47:03 +02:00 committed by GitHub
parent 0388bba624 d7bd0d2fd7
commit 00e178b597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/games/frogatto/data.nix
View file

@ -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 = ''

15
pkgs/games/frogatto/engine.nix
View file

@ -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