Unverified Commit 7ae560ea authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #218887 from astro/frogatto 

frogatto: unstable-2020-12-04 -> unstable-2023-02-27
parents 2b554db6 bdfb775f

pkgs/games/frogatto/data.nix

+4 −4
Original line number Diff line number Diff line
@@ -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; {

pkgs/games/frogatto/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let 
    genericName = "frogatto";

    categories = [ "Game" "ArcadeGame" ];

  };

  version = "unstable-2020-12-04";

  inherit (data) version;

in buildEnv {

  name = "frogatto-${version}";

pkgs/games/frogatto/engine.nix

+6 −11
Original line number Diff line number Diff line 
{ 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;