b9cb606 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

flare: 1.12rc1 -> 1.12rc2

commitb9cb6066f750243fd181973c731c5fba5ba8f229 authorNguyễn Gia Phong <mcsinyx@disroot.org> dateThu 15 Jul 2021, 15:11 (5 years ago) parent3401cee

4 files changed+22−5

compare with master

unifiedsplit

pkgs/games/flare/default.nix+1−1 pkgs/games/flare/desktop.patch+15 pkgs/games/flare/engine.nix+4−2 pkgs/games/flare/game.nix+2−2

pkgs/games/flare/default.nix+1−1

@@ -1,7 +1,7 @@

11{ lib, buildEnv, callPackage, makeWrapper, Cocoa }:

33buildEnv {

4− name = "flare-1.12rc1";

4+ name = "flare-1.12rc2";

66 paths = [

77 (callPackage ./engine.nix { inherit Cocoa; })

pkgs/games/flare/desktop.patchnew file+15

@@ -0,0 +1,15 @@

1+diff --git a/distribution/flare.desktop.in b/distribution/flare.desktop.in

2+index c740e2a6..eef91a89 100644

3+--- a/distribution/flare.desktop.in

4++++ b/distribution/flare.desktop.in

5+@@ -14,8 +14,8 @@ Comment[fr]=Un jeu de rôle d'action monojoueur en 2D isométrique

6+ Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións.

7+ Comment[ru]=Изометрический ролевой боевик для одного игрока

8+ Comment[uk]=Ізометричний рольовий екшн (Action/RPG) для одного гравця

9+-TryExec=@FLARE_EXECUTABLE_PATH@

10+-Exec=@FLARE_EXECUTABLE_PATH@

11++TryExec=flare

12++Exec=flare

13+ Categories=Game;RolePlaying;

14+ Icon=flare

15+ Terminal=false

pkgs/games/flare/engine.nix+4−2

@@ -2,15 +2,17 @@

33stdenv.mkDerivation rec {

44 pname = "flare-engine";

5− version = "1.12rc1";

5+ version = "1.12rc2";

77 src = fetchFromGitHub {

88 owner = "flareteam";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p";

11+ sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq";

1212 };

1313

14+ patches = [ ./desktop.patch ];

15+

1416 nativeBuildInputs = [ cmake ];

1517 buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]

1618 ++ lib.optional stdenv.isDarwin Cocoa;

pkgs/games/flare/game.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "flare-game";