gnu: slade: Update to 3.2.1.

* gnu/packages/game-development.scm (slade): Update to 3.2.1.
[arguments]: Use G-expressions.
[phases]: Remove reset-slade.pk3-timestamp phase.
[inputs]: Remove input labels. Add lua and mpg123. Replace wxwidgets-3.1
with wxwidgets.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
James Smith 2022-10-16 15:49:21 -07:00 committed by Efraim Flashner
parent 3f58fbe34a
commit de61a0aa4a
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -22,7 +22,7 @@
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz> ;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
;;; Copyright © 2020-2021 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2020-2022 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Andy Tai <atai@atai.org> ;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;; Copyright © 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
@ -516,52 +516,45 @@ (define-public python-xsge
(define-public slade (define-public slade
(package (package
(name "slade") (name "slade")
(version "3.1.13") (version "3.2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/sirjuddington/SLADE") (url "https://github.com/sirjuddington/SLADE")
(commit version))) (commit version)))
(sha256 (base32 "009yc5m6y074wfalvwbrnv2zsmaf9yhbi8hzgs973di0zqnqv011")) (sha256 (base32 "11ab38nv190lpvkdba5r2gckdrk4h15pri0zzslz7zy8qzg5fm18"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags (list #:configure-flags
(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON" #~(list "-DWX_GTK3=ON" "-DNO_WEBVIEW=ON"
(string-append "-DWITH_WXPATH=" (string-append "-DWITH_WXPATH="
(assoc-ref %build-inputs "wxwidgets") "/bin") #$(this-package-input "wxwidgets") "/bin")
(string-append "-DwxWidgets_LIBRARIES=" (string-append "-DwxWidgets_LIBRARIES="
(assoc-ref %build-inputs "wxwidgets") "/lib")) #$(this-package-input "wxwidgets") "/lib"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'reset-slade.pk3-timestamps
;; This is neccessary to make slade reproducible due to
;; <https://bugs.gnu.org/44741>. TODO: Remove on next core update
;; cycle.
(lambda _
(invoke "find" "../source/dist/res" "-exec" "touch"
"--no-dereference" "-t" "197001010000.00" "{}"
"+")))
(add-after 'install 'wrap-with-x11-gdk-backend (add-after 'install 'wrap-with-x11-gdk-backend
;; Set GDK_BACKEND to x11 to prevent crash on Wayland. ;; Set GDK_BACKEND to x11 to prevent crash on Wayland.
;; See https://github.com/sirjuddington/SLADE/issues/1097 for details. ;; See https://github.com/sirjuddington/SLADE/issues/1097 for
(lambda* (#:key outputs #:allow-other-keys) ;; details.
(wrap-program (lambda _
(string-append (assoc-ref outputs "out") (wrap-program (string-append #$output "/bin/slade")
"/bin/slade")
'("GDK_BACKEND" = ("x11")))))) '("GDK_BACKEND" = ("x11"))))))
#:tests? #f)) ;; No test suite. #:tests? #f)) ;; No test suite.
(inputs (inputs
`(("bash" ,bash-minimal) (list bash-minimal
("curl" ,curl) curl
("fluidsynth" ,fluidsynth) fluidsynth
("freeimage" ,freeimage) freeimage
("ftgl" ,ftgl) ftgl
("glew" ,glew) glew
("gtk+" ,gtk+) gtk+
("sfml" ,sfml) lua
("wxwidgets" ,wxwidgets-3.1))) mpg123
sfml
wxwidgets))
(native-inputs (native-inputs
(list pkg-config which zip)) (list pkg-config which zip))
(home-page "https://slade.mancubus.net") (home-page "https://slade.mancubus.net")