From: Timotej Lazar <timotej.lazar@araneo.si>
To: 41365@debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar@araneo.si>
Subject: [bug#41365] [PATCH 3/5] gnu: godot: Build and install the headless version.
Date: Sun, 17 May 2020 17:55:18 +0200 [thread overview]
Message-ID: <20200517155520.26183-3-timotej.lazar@araneo.si> (raw)
In-Reply-To: <20200517155520.26183-1-timotej.lazar@araneo.si>
* gnu/packages/game-development.scm (godot): Build the headless (server)
binary. This is needed to package games using Godot without depending on X.
[outputs]: Add "headless".
[arguments]<#:phases>[build-headless]: New phase.
[arguments]<#:phases>[install]: Install headless version to separate output.
---
gnu/packages/game-development.scm | 32 ++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d84b3fb24a..2ed3055cfc 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1617,20 +1617,29 @@ games.")
"env_base = Environment(tools=custom_tools)\n"
"env_base = Environment(ENV=os.environ)")))
#t))
+ ;; Build headless tools, used for packaging games without depending on X.
+ (add-after 'build 'build-headless
+ (lambda* (#:key scons-flags #:allow-other-keys)
+ (apply invoke "scons"
+ `(,(string-append "-j" (number->string (parallel-job-count)))
+ "platform=server" ,@(delete "platform=x11" scons-flags)))))
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
+ (headless (assoc-ref outputs "headless"))
+ (zenity (assoc-ref inputs "zenity")))
+ ;; Strip build info from filenames.
(with-directory-excursion "bin"
- (if (file-exists? "godot.x11.tools.64")
- (rename-file "godot.x11.tools.64" "godot")
- (rename-file "godot.x11.tools.32" "godot"))
- (install-file "godot" bin))
- ;; Tell Godot where to find zenity for OS.alert().
- (wrap-program (string-append bin "/godot")
- `("PATH" ":" prefix
- (,(string-append (assoc-ref %build-inputs "zenity") "/bin"))))
- #t)))
+ (for-each (lambda (file)
+ (let ((dest (car (string-split (basename file) #\.))))
+ (rename-file file dest)))
+ (find-files "." "godot.*\\.x11\\.opt\\.tools.*"))
+ (install-file "godot" (string-append out "/bin"))
+ (install-file "godot_server" (string-append headless "/bin")))
+ ;; Tell the editor where to find zenity for OS.alert().
+ (wrap-program (string-append out "/bin/godot")
+ `("PATH" ":" prefix (,(string-append zenity "/bin")))))
+ #t))
(add-after 'install 'install-godot-desktop
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -1652,6 +1661,7 @@ games.")
Type=Application~%"
out)))
#t))))))
+ (outputs '("out" "headless"))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("alsa-lib" ,alsa-lib)
("bullet" ,bullet)
--
2.26.2
next prev parent reply other threads:[~2020-05-17 15:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 15:52 [bug#41365] [PATCH 0/5] Add superstarfighter Timotej Lazar
2020-05-17 15:55 ` [bug#41365] [PATCH 1/5] gnu: godot: Enable release build Timotej Lazar
2020-05-17 15:55 ` [bug#41365] [PATCH 2/5] gnu: godot: Remove obsolete workaround for aarch64 Timotej Lazar
2020-05-17 15:55 ` Timotej Lazar [this message]
2020-05-17 15:55 ` [bug#41365] [PATCH 4/5] gnu: godot: Install provided .desktop file and icons Timotej Lazar
2020-05-17 15:55 ` [bug#41365] [PATCH 5/5] gnu: Add superstarfighter Timotej Lazar
2020-05-17 15:55 ` [bug#41365] [PATCH 0/5] " Nicolò Balzarotti
2020-05-17 16:03 ` Timotej Lazar
2020-05-18 18:53 ` bug#41365: " Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200517155520.26183-3-timotej.lazar@araneo.si \
--to=timotej.lazar@araneo.si \
--cc=41365@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).