nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: minetest: Use more system libraries. 

* gnu/packages/games.scm (minetest)[source]: Remove bundled libraries in
a snippet.
[arguments]: Add flag to use system jsoncpp.
[inputs]: Add gmp, jsoncpp. Arrange alphabetically.
This commit is contained in:
Efraim Flashner 2018-08-02 12:12:35 +03:00
parent 7b8a753672
commit 7fc90282aa
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/games.scm
View File

@ -109,6 +109,7 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages serialization)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (gnu packages check) #:use-module (gnu packages check)
@ -1638,13 +1639,18 @@ match, cannon keep, and grave-itation pit.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg")))) "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "lib") #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '(#:configure-flags
(list "-DRUN_IN_PLACE=0" (list "-DRUN_IN_PLACE=0"
"-DENABLE_FREETYPE=1" "-DENABLE_FREETYPE=1"
"-DENABLE_GETTEXT=1" "-DENABLE_GETTEXT=1"
"-DENABLE_SYSTEM_JSONCPP=TRUE"
(string-append "-DIRRLICHT_INCLUDE_DIR=" (string-append "-DIRRLICHT_INCLUDE_DIR="
(assoc-ref %build-inputs "irrlicht") (assoc-ref %build-inputs "irrlicht")
"/include/irrlicht") "/include/irrlicht")
@ -1659,18 +1665,20 @@ match, cannon keep, and grave-itation pit.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("irrlicht" ,irrlicht) `(("curl" ,curl)
("libpng" ,libpng) ("freetype" ,(@ (gnu packages fontutils) freetype))
("gettext" ,gettext-minimal)
("gmp" ,gmp)
("irrlicht" ,irrlicht)
("jsoncpp" ,jsoncpp)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
("libxxf86vm" ,libxxf86vm) ("libpng" ,libpng)
("mesa" ,mesa)
("libogg" ,libogg) ("libogg" ,libogg)
("libvorbis" ,libvorbis) ("libvorbis" ,libvorbis)
("openal" ,openal) ("libxxf86vm" ,libxxf86vm)
("freetype" ,(@ (gnu packages fontutils) freetype))
("curl" ,curl)
("luajit" ,luajit) ("luajit" ,luajit)
("gettext" ,gettext-minimal) ("mesa" ,mesa)
("openal" ,openal)
("sqlite" ,sqlite))) ("sqlite" ,sqlite)))
(propagated-inputs (propagated-inputs
`(("minetest-data" ,minetest-data))) `(("minetest-data" ,minetest-data)))