From a10675f43deb7cc41b69829d6f3290b0506618f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 2 Jan 2022 10:54:30 -0800
Subject: [PATCH] liblcf, easyrpg-player: 0.6.2 -> 0.7.0

* liblcf: 0.6.2 -> 0.7.0 (#144396)

* liblcf: build in parallel

* easyrpg-player: 0.6.2.3 -> 0.7.0

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
---
 pkgs/development/libraries/liblcf/default.nix |  5 +++--
 pkgs/games/easyrpg-player/default.nix         | 13 ++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix
index 50c41982450f..45bb7f5b60ed 100644
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@@ -2,17 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "liblcf";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "liblcf";
     rev = version;
-    sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c";
+    sha256 = "sha256-69cYZ8hJ92gK39gueaEoUM0K7BDWIQ/0NvcQ/6e3Sg8=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   propagatedBuildInputs = [ expat icu ];
+  enableParallelBuilding = true;
 
   meta = with lib; {
     description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects";
diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix
index 83e40a4c3407..4476c0a7a532 100644
--- a/pkgs/games/easyrpg-player/default.nix
+++ b/pkgs/games/easyrpg-player/default.nix
@@ -1,22 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config, freetype ? null, glib, harfbuzz ? null
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen ? null, pkg-config
+, freetype ? null, fmt, glib, harfbuzz ? null
 , liblcf, libpng, libsndfile ? null, libvorbis ? null, libxmp ? null
 , libXcursor, libXext, libXi, libXinerama, libXrandr, libXScrnSaver, libXxf86vm
-, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2_mixer, speexdsp ? null, wildmidi ? null, zlib }:
+, mpg123 ? null, opusfile ? null, pcre, pixman, SDL2, speexdsp ? null, wildmidi ? null, zlib
+}:
 
 stdenv.mkDerivation rec {
   pname = "easyrpg-player";
-  version = "0.6.2.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "EasyRPG";
     repo = "Player";
     rev = version;
-    sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp";
+    sha256 = "049bj3jg3ldi3n11nx8xvh6pll68g7dcxz51q6z1gyyfxxws1qpj";
   };
 
   nativeBuildInputs = [ cmake doxygen pkg-config ];
 
   buildInputs = [
+    fmt
     freetype
     glib
     harfbuzz
@@ -34,9 +37,9 @@ stdenv.mkDerivation rec {
     libXxf86vm
     mpg123
     opusfile
-    SDL2_mixer
     pcre
     pixman
+    SDL2
     speexdsp
     wildmidi
     zlib