gnu: xmoto: Update to 0.6.1.

* gnu/packages/games.scm (xmoto): Update to 0.6.1.
[arguments]: Remove phase installing man pages, now properly handled by the
installation script.
This commit is contained in:
Nicolas Goaziou 2020-06-22 00:40:10 +02:00
parent 9546891f95
commit 37ab7837e7
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D

View File

@ -10532,108 +10532,96 @@ This package is part of the KDE games module.")
(license (list license:gpl2+ license:fdl1.2+)))) (license (list license:gpl2+ license:fdl1.2+))))
(define-public xmoto (define-public xmoto
;; The commit below includes a fix to a build error. (package
(let ((commit "f7ca787d02bd876c6eb989a28b180a05220621ee") (name "xmoto")
(revision "0")) (version "0.6.1")
(package (source
(name "xmoto") (origin
(version (git-version "0.6.0" revision commit)) (method git-fetch)
(source (uri (git-reference
(origin (url "https://github.com/xmoto/xmoto.git")
(method git-fetch) (commit version)))
(uri (git-reference (file-name (git-file-name name version))
(url "https://github.com/xmoto/xmoto.git") (sha256
(commit commit))) (base32 "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n"))
(file-name (git-file-name name version)) (modules '((guix build utils)
(sha256 (ice-9 ftw)
(base32 "1kiwqni58vjdqfb289d1dqcb758hdl2k970dawxq5vdaqrbnsxv4")) (srfi srfi-1)))
(modules '((guix build utils) ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but
(ice-9 ftw) ;; it appears to be incompatible with the (older) one bundled.
(srfi srfi-1))) (snippet
;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but `(begin
;; it appears to be incompatible with the (older) one bundled. (let ((keep '("chipmunk" "glad" "md5sum")))
(snippet (with-directory-excursion "vendor"
`(begin (for-each delete-file-recursively
(let ((keep '("chipmunk" "glad" "md5sum"))) (lset-difference string=?
(with-directory-excursion "vendor" (scandir ".")
(for-each delete-file-recursively (cons* "." ".." keep))))
(lset-difference string=? (substitute* "src/CMakeLists.txt"
(scandir ".") (("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library)
(cons* "." ".." keep)))) (if (member library keep) line ""))))
(substitute* "src/CMakeLists.txt" #t))))
(("add_subdirectory\\(.*?/vendor/(.+?)\".*" line library) (build-system cmake-build-system)
(if (member library keep) line "")))) (arguments
#t)))) `(#:tests? #f ;no test
(build-system cmake-build-system) #:phases
(arguments (modify-phases %standard-phases
`(#:tests? #f ;no test (add-after 'unpack 'fix-hard-coded-directory
#:phases (lambda* (#:key outputs #:allow-other-keys)
(modify-phases %standard-phases (substitute* "src/common/VFileIO.cpp"
;; Install phase ignores this man page. Install it early, (("/usr/share")
;; because the process moves to another directory shortly (string-append (assoc-ref outputs "out") "/share")))
;; after. #t))
(add-after 'unpack 'install-man-page (add-before 'build 'set-SDL
(lambda* (#:key outputs #:allow-other-keys) ;; Set correct environment for SDL.
(install-file "xmoto.6" (lambda* (#:key inputs #:allow-other-keys)
(string-append (assoc-ref outputs "out") (setenv "CPATH"
"/share/man/man6")) (string-append
#t)) (assoc-ref inputs "sdl") "/include/SDL:"
(add-after 'unpack 'fix-hard-coded-directory (or (getenv "CPATH") "")))
(lambda* (#:key outputs #:allow-other-keys) #t))
(substitute* "src/common/VFileIO.cpp" (add-after 'install 'unbundle-fonts
(("/usr/share") ;; Unbundle DejaVuSans TTF files.
(string-append (assoc-ref outputs "out") "/share"))) (lambda* (#:key outputs inputs #:allow-other-keys)
#t)) (let ((font-dir (string-append (assoc-ref inputs "font-dejavu")
(add-before 'build 'set-SDL "/share/fonts/truetype/"))
;; Set correct environment for SDL. (target-dir (string-append (assoc-ref outputs "out")
(lambda* (#:key inputs #:allow-other-keys) "/share/xmoto/Textures/Fonts/")))
(setenv "CPATH" (for-each (lambda (f)
(string-append (let ((font (string-append font-dir f))
(assoc-ref inputs "sdl") "/include/SDL:" (target (string-append target-dir f)))
(or (getenv "CPATH") ""))) (delete-file target)
#t)) (symlink font target)))
(add-after 'install 'unbundle-fonts '("DejaVuSans.ttf" "DejaVuSansMono.ttf"))
;; Unbundle DejaVuSans TTF files. #t))))))
(lambda* (#:key outputs inputs #:allow-other-keys) (native-inputs
(let ((font-dir (string-append (assoc-ref inputs "font-dejavu") `(("gettext" ,gettext-minimal)
"/share/fonts/truetype/")) ("pkg-config" ,pkg-config)))
(target-dir (string-append (assoc-ref outputs "out") (inputs
"/share/xmoto/Textures/Fonts/"))) `(("bzip2" ,bzip2)
(for-each (lambda (f) ("curl" ,curl)
(let ((font (string-append font-dir f)) ("font-dejavu" ,font-dejavu)
(target (string-append target-dir f))) ("glu" ,glu)
(delete-file target) ("libjpeg" ,libjpeg-turbo)
(symlink font target))) ("libpng" ,libpng)
'("DejaVuSans.ttf" "DejaVuSansMono.ttf")) ("libxdg-basedir" ,libxdg-basedir)
#t)))))) ("libxml2" ,libxml2)
(native-inputs ("lua" ,lua-5.1)
`(("gettext" ,gettext-minimal) ("ode" ,ode)
("pkg-config" ,pkg-config))) ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
(inputs ("sqlite" ,sqlite)
`(("bzip2" ,bzip2) ("zlib" ,zlib)))
("curl" ,curl) (home-page "https://xmoto.tuxfamily.org/")
("font-dejavu" ,font-dejavu) (synopsis "2D motocross platform game")
("glu" ,glu) (description
("libjpeg" ,libjpeg-turbo) "X-Moto is a challenging 2D motocross platform game, where
("libpng" ,libpng)
("libxdg-basedir" ,libxdg-basedir)
("libxml2" ,libxml2)
("lua" ,lua-5.1)
("ode" ,ode)
("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
("sqlite" ,sqlite)
("zlib" ,zlib)))
(home-page "https://xmoto.tuxfamily.org/")
(synopsis "2D motocross platform game")
(description
"X-Moto is a challenging 2D motocross platform game, where
physics play an all important role in the gameplay. You need to physics play an all important role in the gameplay. You need to
control your bike to its limit, if you want to have a chance finishing control your bike to its limit, if you want to have a chance finishing
the more difficult challenges.") the more difficult challenges.")
(license (list license:gpl2+ ;whole project (license (list license:gpl2+ ;whole project
license:bsd-3 ;vendor/md5sum license:bsd-3 ;vendor/md5sum
license:lgpl2.1+ license:lgpl2.1+
license:expat))))) license:expat))))
(define-public eboard (define-public eboard
(package (package