gnu: openttd-engine: Update to 1.11.2.
* gnu/packages/games.scm (openttd-engine): Update to 1.11.2. [build-system]: Switch to CMake. [arguments]: Enable tests. (openttd)[arguments]<#:configure-flags>: Use CMake flags. <#:phases>: Remove `configure'. Copy assets file before check step to enable tests. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>master
parent
f820315ddd
commit
b1bbeeafb4
|
@ -61,6 +61,7 @@
|
||||||
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
||||||
;;; Copyright © 2021 David Pflug <david@pflug.io>
|
;;; Copyright © 2021 David Pflug <david@pflug.io>
|
||||||
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
|
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
|
||||||
|
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -4315,35 +4316,15 @@ world}, @uref{http://evolonline.org, Evol Online} and
|
||||||
(define openttd-engine
|
(define openttd-engine
|
||||||
(package
|
(package
|
||||||
(name "openttd-engine")
|
(name "openttd-engine")
|
||||||
(version "1.10.3")
|
(version "1.11.2")
|
||||||
(source
|
(source
|
||||||
(origin (method url-fetch)
|
(origin (method url-fetch)
|
||||||
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
|
(uri (string-append "https://cdn.openttd.org/openttd-releases/"
|
||||||
version "/openttd-" version "-source.tar.xz"))
|
version "/openttd-" version "-source.tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0fxmfz1mm95a2x0rnzfff9wb8q57w0cvsdd0z7agdcbyakph25n1"))))
|
"0v9f93lsdcv3ia28y8iihx9nj9zp6fpf5hkdrpl4ypw159d97fhg"))))
|
||||||
(build-system gnu-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
|
||||||
`(#:tests? #f ; no "check" target
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
;; The build process fails if the configure script is passed the
|
|
||||||
;; option "--enable-fast-install".
|
|
||||||
(replace 'configure
|
|
||||||
(lambda* (#:key inputs outputs (configure-flags '())
|
|
||||||
#:allow-other-keys)
|
|
||||||
(let ((out (assoc-ref outputs "out"))
|
|
||||||
(lzo (assoc-ref inputs "lzo")))
|
|
||||||
(apply invoke "./configure"
|
|
||||||
(string-append "--prefix=" out)
|
|
||||||
;; Provide the "lzo" path.
|
|
||||||
(string-append "--with-liblzo2="
|
|
||||||
lzo "/lib/liblzo2.a")
|
|
||||||
;; Put the binary in 'bin' instead of 'games'.
|
|
||||||
"--binary-dir=bin"
|
|
||||||
configure-flags)))))))
|
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("allegro" ,allegro)
|
`(("allegro" ,allegro)
|
||||||
("fontconfig" ,fontconfig)
|
("fontconfig" ,fontconfig)
|
||||||
|
@ -4510,19 +4491,17 @@ Transport Tycoon Deluxe.")
|
||||||
(name "openttd")
|
(name "openttd")
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
`(#:configure-flags
|
||||||
(list (string-append "--with-midi=" (assoc-ref %build-inputs "timidity++")
|
(let* ((out (assoc-ref %outputs "out")))
|
||||||
"/bin/timidity"))
|
(list (string-append "-DCMAKE_INSTALL_BINDIR=" out "/bin")))
|
||||||
,@(substitute-keyword-arguments (package-arguments openttd-engine)
|
#:phases
|
||||||
((#:phases phases)
|
(modify-phases %standard-phases
|
||||||
`(modify-phases ,phases
|
(add-before 'check 'install-data
|
||||||
(add-after 'install 'install-data
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(for-each
|
||||||
(for-each
|
(lambda (input)
|
||||||
(lambda (input)
|
(copy-recursively (assoc-ref inputs input)
|
||||||
(copy-recursively (assoc-ref inputs input)
|
(assoc-ref outputs "out")))
|
||||||
(assoc-ref outputs "out")))
|
(list "opengfx" "openmsx" "opensfx")))))))
|
||||||
(list "opengfx" "openmsx" "opensfx"))
|
|
||||||
#t)))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("timidity++" ,timidity++)
|
`(("timidity++" ,timidity++)
|
||||||
,@(package-inputs openttd-engine)))
|
,@(package-inputs openttd-engine)))
|
||||||
|
|
Reference in New Issue