From patchwork Wed Aug 25 18:02:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32262 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E02727BBE4; Wed, 25 Aug 2021 19:05:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA0A527BBE1 for ; Wed, 25 Aug 2021 19:05:02 +0100 (BST) Received: from localhost ([::1]:58120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGn-0001Ga-W0 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFv-00081j-S1 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFv-0000s0-Im for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFv-0002o4-EH for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 12/52] gnu: dbus-cairo: Add missing bash-minimal input. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463910613 (code B ref 50201); Wed, 25 Aug 2021 18:04:07 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:59 +0000 Received: from localhost ([127.0.0.1]:47687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFn-0002l0-94 for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:59 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFX-0002fp-8F for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3iU7; Wed, 25 Aug 2021 20:03:42 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:52 +0200 Message-Id: <20210825180332.5720-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914623; bh=gBPT0tubBz5IJIRTeffHz8epfaWBlp2lIrMh6QLn+2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Und/hHPVbFrMwdBc+ixivMM85OTQbF62MmE+20VnFrFEuRWel2SLrug2vXJ3l/jaV JofD1JrKA1DqjDmImmgPq/zR1ZTYj8V+tFwZ1kBmaFlyYmDsW/zKUQOok1sXnNLDTG hvRi8a215ojFQ2gAZXQRgCSsePRPIrDDoQ+8MrPanqGgBFEtLdAHq926kIbNWxNlUO p38b3MzwN2cuvTAi2wFWq8w8spJnZcRqtFtxwlt3Wv0nhh4AqSxYdqGen0v4yZiJ9L 2INrhaken7Ex0ogXYkgHgTpzjtS2YDa62l774qBJ9Ypbj2fkzz2Bk6FBFM41G80NZ0 M9eCpaJIhYNxg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches If absent, this causes the 'glib-or-gtk-wrap' phase to fail. * gnu/packages/glib.scm (cairo)[inputs]: Add "bash-minimal", but only when cross-compiling to avoid a world-rebuild. --- gnu/packages/gtk.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 24c24d5653..3470691e51 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages texinfo) @@ -174,7 +175,11 @@ tools have full access to view and control running applications.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("drm" ,libdrm) + ;; TODO(core-updates): make this unconditional + `(,@(if (%current-target-system) + `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap + '()) + ("drm" ,libdrm) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) ("poppler" ,poppler)))