ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 07:00:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xonotic: Normalise building Darkplaces.

Browse source 
* gnu/packages/games.scm (xonotic)[arguments]: Build Darkplaces in a single pass.
Honour MAKE-FLAGS, PARALLEL-BUILD?, and CC-FOR-TARGET.
This commit is contained in:
Tobias Geerinckx-Rice 2022-08-07 02:00:00 +02:00
parent 3dc16fe0dc
commit 22f865b7e6
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/games.scm
View file

@ -7812,34 +7812,25 @@ (define-public xonotic
"--disable-rijndael") "--disable-rijndael")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'configure 'make-darkplaces (add-before 'configure 'build-darkplaces
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key make-flags parallel-build? outputs
#:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(share (string-append out "/share/xonotic/"))) (share (string-append out "/share/xonotic/")))
(invoke "make" "-C" "source/darkplaces" (apply invoke "make"
(string-append "DP_FS_BASEDIR=" "-C" "source/darkplaces"
share) "-f" "makefile"
"-j" (if parallel-build?
(number->string (parallel-job-count))
"1")
(string-append "CC=" #$(cc-for-target))
(string-append "DP_FS_BASEDIR=" share)
"DP_LINK_TO_LIBJPEG=1" "DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA" "DP_SOUND_API=ALSA"
"CC=gcc" "cl-release"
"-f" "makefile" "sdl-release"
"cl-release") "sv-release"
(invoke "make" "-C" "source/darkplaces" make-flags))))
(string-append "DP_FS_BASEDIR="
share)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"CC=gcc"
"-f" "makefile"
"sdl-release")
(invoke "make" "-C" "source/darkplaces"
(string-append "DP_FS_BASEDIR="
share)
"DP_LINK_TO_LIBJPEG=1"
"DP_SOUND_API=ALSA"
"CC=gcc"
"-f" "makefile"
"sv-release"))))
(add-before 'configure 'bootstrap (add-before 'configure 'bootstrap
(lambda _ (lambda _
(chdir "source/d0_blind_id") (chdir "source/d0_blind_id")