me/guix
Archived
1
0
Fork 0
Code Activity

gnu: wesnoth: Update to 1.18.0.

Browse source 
* gnu/packages/games.scm (wesnoth): Update to 1.18.0.
[arguments]: Pass "-DENABLE_SYSTEM_LUA=ON" to 'configure-flags'.  Add phases.
[inputs]: Remove fribidi, sdl-union, sdl2-ttf.  Add curl, lua-5.4.
[native-inputs]: Add python-minimal.
(wesnoth-server): Update to 1.18.0.
[inputs]: Remove sdl2.  Add lua-5.4.
[native-inputs]: Replace with pkg-config.
[arguments]: Rewrite with 'substitute-keyword-arguments'.

Change-Id: I1ee4237dbbaeeb9d5a93637d740fbf4dba0922d2
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
宋文武 2024-03-26 21:50:38 +08:00 • committed by Christopher Baines
parent 3fe585ff32
commit e9a547d2c5
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/games.scm
View file

@ -4613,7 +4613,7 @@ falling, themeable graphics and sounds, and replays.")
(define-public wesnoth (define-public wesnoth
(package (package
(name "wesnoth") (name "wesnoth")
(version "1.16.11") (version "1.18.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -4622,21 +4622,36 @@ falling, themeable graphics and sounds, and replays.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0z0y2il4xq8fdj20fwfggpf6286hb099jh1kdywap9rlrybq142d")))) "0ar0zkyl4rzqgambmdqhklscx478liql1k458ax64bp4xw441kfc"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f)) ;no test target (list #:tests? #f ;no test target
#:configure-flags #~'("-DENABLE_SYSTEM_LUA=ON")
#:phases
#~(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda _
;; XXX: Our Lua doesn't have a C++ library, force C linkage.
(substitute* '("src/lua/wrapper_lua.h"
"src/lua/wrapper_lualib.h"
"src/lua/wrapper_lauxlib.h")
(("#include \"(lua|lualib|lauxlib)\\.h\"")
"#include \"lua.hpp\"")))))))
(inputs (inputs
(list boost (list boost
curl
dbus dbus
fribidi
libvorbis libvorbis
lua-5.4
openssl openssl
pango pango
(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) sdl2
sdl2-image
sdl2-mixer))
(native-inputs (native-inputs
(list gettext-minimal (list gettext-minimal
pkg-config)) pkg-config
python-minimal))
(home-page "https://www.wesnoth.org/") (home-page "https://www.wesnoth.org/")
(synopsis "Turn-based strategy game") (synopsis "Turn-based strategy game")
(description (description
@ -4655,10 +4670,13 @@ next campaign.")
(inherit wesnoth) (inherit wesnoth)
(name "wesnoth-server") (name "wesnoth-server")
(inputs (inputs
(list boost icu4c openssl sdl2)) (list boost icu4c lua-5.4 openssl))
(native-inputs
(list pkg-config))
(arguments (arguments
`(#:configure-flags '("-DENABLE_GAME=OFF") (substitute-keyword-arguments (package-arguments wesnoth)
,@(package-arguments wesnoth))) ((#:configure-flags _)
#~'("-DENABLE_SYSTEM_LUA=ON" "-DENABLE_GAME=OFF"))))
(synopsis "Dedicated @emph{Battle for Wesnoth} server") (synopsis "Dedicated @emph{Battle for Wesnoth} server")
(description "This package contains a dedicated server for @emph{The (description "This package contains a dedicated server for @emph{The
Battle for Wesnoth}."))) Battle for Wesnoth}.")))