TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: godot: Unbundle some dependencies.

Browse source 
* gnu/packages/game-development.scm (godot)[inputs]: Add bullet, mbedtls-apache,
pcre2 and zstd.
[arguments](configure-flags): Use system libraries for the above.
[source](snippet): Remove bundled copies.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Timotej Lazar 2020-01-28 19:25:39 +01:00 committed by Christopher Baines
parent d868261533
commit c1bc92c0aa
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ (define-module (gnu packages game-development)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages music)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
@ -1521,15 +1522,19 @@ (define-public godot
;; of these may be modified; see "thirdparty/README.md".
(with-directory-excursion "thirdparty"
(for-each delete-file-recursively
'("freetype"
'("bullet"
"freetype"
"libogg"
"libpng"
"libtheora"
"libvorbis"
"libvpx"
"libwebp"
"mbedtls"
"opus"
"zlib"))
"pcre2"
"zlib"
"zstd"))
#t)))))
(build-system scons-build-system)
(arguments
@ -1541,6 +1546,7 @@ (define-public godot
'())
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
"builtin_bullet=no"
"builtin_freetype=no"
"builtin_glew=no"
"builtin_libmpdec=no"
@ -1550,8 +1556,11 @@ (define-public godot
"builtin_libvorbis=no"
"builtin_libvpx=no"
"builtin_libwebp=no"
"builtin_mbedtls=no"
"builtin_opus=no"
"builtin_zlib=no")
"builtin_pcre2=no"
"builtin_zlib=no"
"builtin_zstd=no")
#:tests? #f ; There are no tests
#:phases
(modify-phases %standard-phases
@ -1598,6 +1607,7 @@ (define-public godot
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("alsa-lib" ,alsa-lib)
("bullet" ,bullet)
("freetype" ,freetype)
("glew" ,glew)
("glu" ,glu)
@ -1610,9 +1620,12 @@ (define-public godot
("libxi" ,libxi)
("libxinerama" ,libxinerama)
("libxrandr" ,libxrandr)
("mbedtls" ,mbedtls-apache)
("mesa" ,mesa)
("opusfile" ,opusfile)
("pulseaudio" ,pulseaudio)))
("pcre2" ,pcre2)
("pulseaudio" ,pulseaudio)
("zstd" ,zstd "lib")))
(home-page "https://godotengine.org/")
(synopsis "Advanced 2D and 3D game engine")
(description