diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/easyrpg.scm | |
parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
download | guix-0d41fe4855588fb659b8adafe215d5573517a79b.tar.gz guix-0d41fe4855588fb659b8adafe215d5573517a79b.zip |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/easyrpg.scm')
-rw-r--r-- | gnu/packages/easyrpg.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/easyrpg.scm b/gnu/packages/easyrpg.scm index e4a1e2fb42..3a5413d94a 100644 --- a/gnu/packages/easyrpg.scm +++ b/gnu/packages/easyrpg.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages sdl) #:use-module (gnu packages xdisorg) @@ -40,7 +41,7 @@ (define-public liblcf (package (name "liblcf") - (version "0.6.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append @@ -48,7 +49,7 @@ "/liblcf-" version ".tar.gz")) (sha256 (base32 - "0n2k4brd264jg9p6918x7dnb2iimpzjh8q3v1fws58450xbgnkqc")))) + "10ghpwww5r3iwlaw1mvf6kamn142nyr2zwdabqghy3k4xv837cih")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) @@ -75,7 +76,7 @@ It can read and write LCF and XML files.") (define-public easyrpg-player (package (name "easyrpg-player") - (version "0.6.2.3") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append @@ -83,7 +84,7 @@ It can read and write LCF and XML files.") "/easyrpg-player-" version ".tar.gz")) (sha256 (base32 - "1lahbhgyhky0hgd3xwhgg2nm8mfa9p2i1fzxi00561hnk2ya86pm")))) + "1hm4hdi4l8c9jw0x3kcm6iwgfv8parlfj13va3r3p90040gs7s8l")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -92,7 +93,9 @@ It can read and write LCF and XML files.") (native-inputs (list pkg-config)) (inputs - (list freetype + (list fluidsynth + fmt + freetype harfbuzz liblcf libpng |