From patchwork Tue Aug 2 12:13:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 41092 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 724CA27BBEA; Tue, 2 Aug 2022 13:14:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2488C27BBE9 for ; Tue, 2 Aug 2022 13:14:18 +0100 (BST) Received: from localhost ([::1]:49436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIqmv-0001fR-9y for patchwork@mira.cbaines.net; Tue, 02 Aug 2022 08:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIqmh-0001XI-7I for guix-patches@gnu.org; Tue, 02 Aug 2022 08:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIqmg-0000AB-Ue for guix-patches@gnu.org; Tue, 02 Aug 2022 08:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIqmg-0008JJ-QC for guix-patches@gnu.org; Tue, 02 Aug 2022 08:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56882] [PATCH 2/4] gnu: freedesktop: Add 'bash' input for 'wrap-program' Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Aug 2022 12:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56882@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 56882-submit@debbugs.gnu.org id=B56882.165944242531891 (code B ref 56882); Tue, 02 Aug 2022 12:14:02 +0000 Received: (at 56882) by debbugs.gnu.org; 2 Aug 2022 12:13:45 +0000 Received: from localhost ([127.0.0.1]:42752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmO-0008IH-TY for submit@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:45 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:54766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIqmC-0008HJ-UW for 56882@debbugs.gnu.org; Tue, 02 Aug 2022 08:13:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by andre.telenet-ops.be with bizsmtp id 2cDX2800520ykKC01cDXHc; Tue, 02 Aug 2022 14:13:31 +0200 From: Maxime Devos Date: Tue, 2 Aug 2022 14:13:27 +0200 Message-Id: <20220802121329.22276-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220802121329.22276-1-maximedevos@telenet.be> References: <20220802121329.22276-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1659442411; bh=3iNlO7n2Jmk2lnUdUUMu8vve5ElfmGhWvUBSU+LzUps=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ga9vJSqmY953j1Vm267R/3am/i7sgcb+kfdzMDprsX63qD4J8svxDMMLnpGty7Vtg Tr0kQhysbWZV6zU4Gr0W1GYG3WKktLs++gkLDE0WRJU3XRK1GFYGTst3awB8mlE0jH 8Lmy7nXiXB/mv6XjtMyRT0Q+OGAyw1Mduky15OoVJV/eEZ2+KpmGziH197don0VYlh 3qVxIepVpWaHSHijGzdoK1Mo0vj5kI+ODeiw9h84eeg8Vv2ANbN2fCv5TIDpRmCHJh +Edw8ugcDfBIVmMHSwyp5Z5KChBtmx1c7ttMvIZgRUShD5JVLjGOLvVVu/PDYEEmby o0hI8ajmYV8fA== 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 It is required for cross-compilation. Cherry-picked from . * gnu/packages/freedesktop.scm (udisks)[inputs]: Add 'bash-minimal' when cross-compiling. (perl-file-mimeinfo)[inputs]: Likewise. (udiskie)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4d06235771..577b354f66 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1319,13 +1319,17 @@ (define-public udisks (propagated-inputs (list glib)) ; required by udisks2.pc (inputs - (list acl - cryptsetup - libatasmart - libblockdev - libgudev - polkit - util-linux)) + `(,acl + ;; TODO(staging): Make unconditional. + ,@(if (%current-target-system) + (list bash-minimal) ; for wrap-program + '()) + ,cryptsetup + ,libatasmart + ,libblockdev + ,libgudev + ,polkit + ,util-linux)) (outputs '("out" "doc")) ;5 MiB of gtk-doc HTML (arguments @@ -1930,6 +1934,11 @@ (define-public perl-file-mimeinfo (base32 "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi")))) (build-system perl-build-system) + (inputs + ;; TODO(staging): Make unconditional. + (if (%current-target-system) + (list bash-minimal) ; for wrap-program + '())) ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and ;; perl-test-tiny as native-inputs. (propagated-inputs @@ -2026,7 +2035,15 @@ (define-public udiskie ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection))) (inputs - (list gobject-introspection gtk+ libappindicator libnotify udisks)) + ;; TODO(staging): Make unconditional. + `(,@(if (%current-target-system) + (list bash-minimal) + '()) + ,gobject-introspection + ,gtk+ + ,libappindicator + ,libnotify + ,udisks)) (propagated-inputs (list python-docopt python-pygobject python-keyutils python-pyxdg python-pyyaml))