guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

43/43: gnu: godot: Use system brotli.


From: guix-commits
Subject: 43/43: gnu: godot: Use system brotli.
Date: Sat, 5 Aug 2023 08:36:19 -0400 (EDT)

lilyp pushed a commit to branch master
in repository guix.

commit 4739e6844cfbf815357019faf708d3c266137acc
Author: TakeV <takev@disroot.org>
AuthorDate: Thu Jul 27 21:26:37 2023 -0700

    gnu: godot: Use system brotli.
    
    * gnu/packages/game-development.scm (godot)[source]: Do not preserve brotli.
    [arguments]<#:scons-flags>: Add “builtin_brotli=no”.
    [inputs]: Add brotli.
    
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 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 @@ scripted in a Python-like language.")
                               "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 @@ scripted in a Python-like language.")
                         "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 @@ scripted in a Python-like language.")
      (list pkg-config))
     (inputs
      (list alsa-lib
+           brotli
            dbus
            embree
            enet



reply via email to

[Prev in Thread] Current Thread [Next in Thread]