amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: godot: Update to 3.4.2.

Browse source 
* gnu/packages/game-development.scm (godot): Update to 3.4.2.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2022-01-06 05:29:22 +01:00
parent aebfc1425d
commit 8f90ff4cb8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/game-development.scm
View file

@ -1816,7 +1816,7 @@ games.")
(define-public godot (define-public godot
(package (package
(name "godot") (name "godot")
(version "3.4") (version "3.4.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1825,7 +1825,7 @@ games.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx")) "1bm9yl995chvx6jwkdia12yjrgwcpzb1r9bmj606q8z264aw2ma5"))
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-1))) (srfi srfi-1)))
@ -1863,8 +1863,7 @@ games.")
(for-each delete-file-recursively (for-each delete-file-recursively
(lset-difference string=? (lset-difference string=?
(scandir ".") (scandir ".")
(cons* "." ".." preserved-files))))) (cons* "." ".." preserved-files)))))))))
#t))))
(build-system scons-build-system) (build-system scons-build-system)
(arguments (arguments
`(#:scons ,scons-python2 `(#:scons ,scons-python2
@ -1898,8 +1897,7 @@ games.")
(("env_base = Environment\\(tools=custom_tools\\)") (("env_base = Environment\\(tools=custom_tools\\)")
(string-append (string-append
"env_base = Environment(tools=custom_tools)\n" "env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)"))) "env_base = Environment(ENV=os.environ)")))))
#t))
;; Build headless tools, used for packaging games without depending on X. ;; Build headless tools, used for packaging games without depending on X.
(add-after 'build 'build-headless (add-after 'build 'build-headless
(lambda* (#:key scons-flags #:allow-other-keys) (lambda* (#:key scons-flags #:allow-other-keys)
@ -1922,8 +1920,7 @@ games.")
(install-file "godot_server" (string-append headless "/bin"))) (install-file "godot_server" (string-append headless "/bin")))
;; Tell the editor where to find zenity for OS.alert(). ;; Tell the editor where to find zenity for OS.alert().
(wrap-program (string-append out "/bin/godot") (wrap-program (string-append out "/bin/godot")
`("PATH" ":" prefix (,(string-append zenity "/bin"))))) `("PATH" ":" prefix (,(string-append zenity "/bin")))))))
#t))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a
@ -1935,8 +1932,7 @@ games.")
(pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib")) (pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib"))
(alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib"))) (alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib")))
(wrap-program (string-append out "/bin/godot") (wrap-program (string-append out "/bin/godot")
`("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path)))) `("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path))))))
#t))
(add-after 'install 'install-godot-desktop (add-after 'install 'install-godot-desktop
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -1950,8 +1946,7 @@ games.")
(copy-file icon dest)) (copy-file icon dest))
'("icon.png" "icon.svg") '("icon.png" "icon.svg")
`(,(string-append icons "/256x256/apps/godot.png") `(,(string-append icons "/256x256/apps/godot.png")
,(string-append icons "/scalable/apps/godot.svg")))) ,(string-append icons "/scalable/apps/godot.svg")))))))))
#t)))))
(outputs '("out" "headless")) (outputs '("out" "headless"))
(native-inputs (list pkg-config)) (native-inputs (list pkg-config))
(inputs `(("alsa-lib" ,alsa-lib) (inputs `(("alsa-lib" ,alsa-lib)