From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0M8UBfszw2SCHAEASxT56A (envelope-from ) for ; Fri, 28 Jul 2023 05:20:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cHQRBfszw2T0eAEAauVa8A (envelope-from ) for ; Fri, 28 Jul 2023 05:20:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C5D2139DCA for ; Fri, 28 Jul 2023 05:20:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=AAM9pBWW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690514427; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=tot6C4Qs2i3JaFwwviGUENMZi89ZRi8Ml1MFAqVd67o=; b=NnK0Q3UmLlZ/Ii1GXNOKdtOA/ZhC5WGp5FFbfVzzF4DMIri83snK3pim3b9Hz55pPNQKD0 +TPKjQgQfklOwXiadAHLclL3fyLurX4rmyyrKiNggYDj1MGGMZUGTWebvNiqclc4WbTBg+ TUFopy64RiPkov6C7u0SdkNFhyTmAA2UrQ97YJu3FurUkU8YoklP53CouecONJMAzZdtkr xK+e0kqkfqhDDv0qAG+BS85Jeu+t3PeXDVh8q/GnIinukZkV+OUY9XLJYKSAgVSNNkXD3/ thSii3B4Iw3F8mANN8A6MTyiNHIlutiKycUoxrrncWemdQRu4c2YygkKnrAk1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690514427; a=rsa-sha256; cv=none; b=fv0r3cR7AbCbdTVtd8TOQCvh92ASe6lLBfwhZrUuWSp2SUE/r4dxzZvBUOXPaZARGZ4FdE 2Dlnsu8k9t1sLlryxaejobhiccCV5ZEY2Y61w+iIH5+4P91fq3/vnp8Bxy3MaLwVXHZhDS Qj8ZrdAqKONXXdQ2sTctiAf8sZaqAdNN5liyjzfag0Vlp2cQRcpwVAeDOZi0Nt7wf6/o4g T/pN8l3siU48ZPN75SnR7+k+mGfzLf6FSQFQig34kpW3Fxvlz7y71sVfHAL+kidGkXrcz2 rS95XCH9wmCjRNcCCr8PZoOSnyU+bCNGuXdZ26gVxEn8tQpPZsaYAjxSvoZS/A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=AAM9pBWW; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qPDg7-0003SQ-7G; Thu, 27 Jul 2023 22:58:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDg5-0003SE-Rz for guix-patches@gnu.org; Thu, 27 Jul 2023 22:58:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qPDg5-0006LW-5n for guix-patches@gnu.org; Thu, 27 Jul 2023 22:58:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qPDg1-0000hh-Qe; Thu, 27 Jul 2023 22:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64909] [PATCH] * gnu/packages/game-development.scm (godot) [arguments, inputs]: use system brotli Resent-From: TakeV Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 28 Jul 2023 02:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64909 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64909@debbugs.gnu.org Cc: TakeV , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by submit@debbugs.gnu.org id=B.16905130782694 (code B ref -1); Fri, 28 Jul 2023 02:58:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2023 02:57:58 +0000 Received: from localhost ([127.0.0.1]:43345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPDfx-0000hO-Tq for submit@debbugs.gnu.org; Thu, 27 Jul 2023 22:57:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qPDfw-0000hB-49 for submit@debbugs.gnu.org; Thu, 27 Jul 2023 22:57:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDfq-0003NT-GE for guix-patches@gnu.org; Thu, 27 Jul 2023 22:57:50 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qPDfo-0006KT-5Y for guix-patches@gnu.org; Thu, 27 Jul 2023 22:57:50 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id EF5D141615; Fri, 28 Jul 2023 04:57:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T1Czk8gQ9Sx4; Fri, 28 Jul 2023 04:57:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1690513062; bh=c3LcO7HoJCygcW/l1C5U8tulXGANzj0T73ZGSgGt4FQ=; h=From:To:Cc:Subject:Date; b=AAM9pBWWjTjlsAuLjedIPzv2cTjTs8VZJO3FeLpfB//2HYSJ5g6tEkupLpW9MVpoO Hv29eDSpwghKmT64unhNaQk5omxK2g34TyLsRlRikdgLr28W/tCEIm4wiXYSUhnD1P F9lpvcAKtCWTFnFATMYXdl8wS332+Hn7zsBw2hOrPB4wEK7AKuA27xeGtHXSw7a+/j rYS3Vtyny/y/gzH/bZvrOn0eKkHUT9W59ozZOs5ZGtESXo13vrDlbkm6yaHuw7AMCU 31AaBkfLo8NYJXW0vXle8K188PiaYMcAkckus9vm/Ugs5Dl5ZIwniq6psFyLLOWOyF 8zfs3OlH863SA== Date: Thu, 27 Jul 2023 19:54:23 -0700 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=takev@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: TakeV X-ACL-Warn: , TakeV via Guix-patches From: TakeV via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -3.14 X-Spam-Score: -3.14 X-Migadu-Queue-Id: C5D2139DCA X-TUID: /E0iVcd2fd+K I noticed this todo could be resolved, since the merge was built and deployed upstream. --- 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 127cbac127..84bbd68cce 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 - ;; - ;; 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: 35c8d631d2bd63c64e863b5509f29fdcb7f856e6 -- 2.41.0