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

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Mark H Weaver 2018-04-30 04:03:54 -04:00
commit 3d5ad159b3
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
105 changed files with 29149 additions and 23582 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -1059,16 +1060,34 @@ games.")
(define-public godot
(package
(name "godot")
(version "3.0.1")
(version "3.0.2")
(source (origin
(method url-fetch)
(uri
(string-append "https://github.com/godotengine/godot/archive/"
version "-stable.tar.gz"))
(file-name (string-append name "-" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0k8c12nzhl98i9il9s3awbwdamkrwxk0s47jr7n8a3z93rpszd2p"))))
"0ldnk3j4w2kh454mzclmq8nk7zqrn758yrqq85i4kzljpkf93g0m"))
(modules '((guix build utils)))
(snippet
'(begin
;; Drop libraries that we take from Guix. Note that some
;; of these may be modified; see "thirdparty/README.md".
(with-directory-excursion "thirdparty"
(for-each delete-file-recursively
'("freetype"
"libogg"
"libpng"
"libtheora"
"libvorbis"
"libvpx"
"libwebp"
"openssl"
"opus"
"zlib"))
#t)))))
(build-system scons-build-system)
(arguments
`(#:scons ,scons-python2
@ -1086,6 +1105,7 @@ games.")
"builtin_libpng=no"
"builtin_libtheora=no"
"builtin_libvorbis=no"
"builtin_libvpx=no"
"builtin_libwebp=no"
"builtin_openssl=no"
"builtin_opus=no"
@ -1141,6 +1161,7 @@ games.")
("glu" ,glu)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
("libvpx" ,libvpx)
("libwebp" ,libwebp)
("libx11" ,libx11)
("libxcursor" ,libxcursor)