From: TakeV via Guix-patches via <guix-patches@gnu.org>
To: 64909@debbugs.gnu.org
Cc: TakeV <takev@disroot.org>,
"Liliana Marie Prikler" <liliana.prikler@gmail.com>,
宋文武 <iyzsong@envs.net>
Subject: [bug#64909] [PATCH vREVISION] gnu: godot: Use system brotli.
Date: Mon, 31 Jul 2023 18:29:14 -0700 [thread overview]
Message-ID: <a44e64b2866e47a2912e33c05e1be400fb899fd1.1690853354.git.takev@disroot.org> (raw)
In-Reply-To: <cfff80a9a30b1ddfad0330f8856673050a2705ce.1690512863.git.takev@disroot.org>
Updated the commit.
* gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli.
[arguments]<#:scons-flags>: Add “builtin_brotli=no”.
[inputs]: Add brotli.
---
gnu/packages/game-development.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index f4b1a1e1e3..5771b7530f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2017,10 +2017,6 @@ (define-public godot
"assimp"
"astcenc"
"basis_universal"
- ;; TODO: Can unbundle once
- ;; <https://github.com/godotengine/godot/pull/79101>
- ;; is merged
- "brotli"
;; Godot needs ca-certificates.crt, but that is
;; not available in build environment
"certs"
@@ -2067,6 +2063,7 @@ (define-public godot
"use_volk=no"
;; Avoid using many of the bundled libs.
;; Note: These options can be found in the SConstruct file.
+ "builtin_brotli=no"
"builtin_embree=no"
"builtin_enet=no"
"builtin_freetype=no"
@@ -2193,6 +2190,7 @@ (define-public godot
(list pkg-config))
(inputs
(list alsa-lib
+ brotli
dbus
embree
enet
base-commit: 39fbc041f92489ec30075a85937c8a38723752dc
--
2.41.0
prev parent reply other threads:[~2023-08-01 1:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 2:54 [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli TakeV via Guix-patches via
2023-07-28 4:26 ` [bug#64909] [PATCH vREVISION] gnu: godot: Use " TakeV via Guix-patches via
2023-07-30 6:57 ` Liliana Marie Prikler
2023-08-05 12:37 ` bug#64909: " Liliana Marie Prikler
2023-08-01 1:29 ` TakeV via Guix-patches via [this message]
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=a44e64b2866e47a2912e33c05e1be400fb899fd1.1690853354.git.takev@disroot.org \
--to=guix-patches@gnu.org \
--cc=64909@debbugs.gnu.org \
--cc=iyzsong@envs.net \
--cc=liliana.prikler@gmail.com \
--cc=takev@disroot.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).