Merge pull request #130251 from McSinyx/flare-1.12rc2

flare: 1.12rc1 -> 1.12rc2

4 files changed, 22 insertions, 5 deletions

diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix
index b0d5f634135d..8cd70aed6143 100644
--- a/pkgs/games/flare/default.nix
+++ b/pkgs/games/flare/default.nix
@@ -1,7 +1,7 @@
 { lib, buildEnv, callPackage, makeWrapper, Cocoa }:
 
 buildEnv {
-  name = "flare-1.12rc1";
+  name = "flare-1.12rc2";
 
   paths = [
     (callPackage ./engine.nix { inherit Cocoa; })
diff --git a/pkgs/games/flare/desktop.patch b/pkgs/games/flare/desktop.patch
new file mode 100644
index 000000000000..1ef3c21d010e
--- /dev/null
+++ b/pkgs/games/flare/desktop.patch
@@ -0,0 +1,15 @@
+diff --git a/distribution/flare.desktop.in b/distribution/flare.desktop.in
+index c740e2a6..eef91a89 100644
+--- a/distribution/flare.desktop.in
++++ b/distribution/flare.desktop.in
+@@ -14,8 +14,8 @@ Comment[fr]=Un jeu de rôle d'action monojoueur en 2D isométrique
+ Comment[gl]=Xogo individual de acción e rol cunha vista isométrica en dúas dimensións.
+ Comment[ru]=Изометрический ролевой боевик для одного игрока
+ Comment[uk]=Ізометричний рольовий екшн (Action/RPG) для одного гравця
+-TryExec=@FLARE_EXECUTABLE_PATH@
+-Exec=@FLARE_EXECUTABLE_PATH@
++TryExec=flare
++Exec=flare
+ Categories=Game;RolePlaying;
+ Icon=flare
+ Terminal=false
diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix
index 9104195febc9..1f1f35a3762d 100644
--- a/pkgs/games/flare/engine.nix
+++ b/pkgs/games/flare/engine.nix
@@ -2,15 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "flare-engine";
-  version = "1.12rc1";
+  version = "1.12rc2";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bl5vayf87y2jd6b1w4nn7pbrhix6dj86xv5kzqxz6b2y65lq73p";
+    sha256 = "10il9dpbcka1w5glmhv48bqwww44csmhq426lvsc7z84444gvvgq";
   };
 
+  patches = [ ./desktop.patch ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf ]
     ++ lib.optional stdenv.isDarwin Cocoa;
diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix
index 7eae29f84d18..10e27b4d39c0 100644
--- a/pkgs/games/flare/game.nix
+++ b/pkgs/games/flare/game.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flare-game";
-  version = "1.12rc1";
+  version = "1.12rc2";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i2fa2hds5ph8gf5b9647vrn7ycz2fl9xaaaybz8yrjmnpx27bzc";
+    sha256 = "0k9fnbaqfgmih8bd0sh3kbk6f6v74i95wrbkij48gp48pq8yqbf9";
   };
 
   nativeBuildInputs = [ cmake ];