From patchwork Fri Jul 2 10:06:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30911 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 D8D5927BC81; Fri, 2 Jul 2021 11:11:29 +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,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 9CDCA27BC78 for ; Fri, 2 Jul 2021 11:11:29 +0100 (BST) Received: from localhost ([::1]:36218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzG8u-0004L0-KB for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6u-0007fg-1I for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:25 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6t-0004VA-Dz for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6t-0008PS-8s for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 028/128] gnu: cdrom: Add 'bash' input for 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:09:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.162522055632191 (code B ref 49327); Fri, 02 Jul 2021 10:09:23 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:16 +0000 Received: from localhost ([127.0.0.1]:34565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6m-0008Mw-0t for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:16 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6N-0008Bz-Hx for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:51 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8rDK; Fri, 02 Jul 2021 12:08:51 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:34 +0200 Message-Id: <20210702100814.23249-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702100814.23249-1-maximedevos@telenet.be> References: <20210702100814.23249-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220531; bh=j3EROFP3xe06euS2T4Nte/AYfGr/Kv4+T0A+5bvbuSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rlPvmBQtfOjyTtI2c2r7wq9yiRhWMw4Ms8ivNbe+GL8xNcYt54PoWCYcAJZjmcjo6 njSGbU1agiL1YdbBZPTrANiY6wOiQZFUitRj1u83cspdSElCWh+QrhBbE4jx3+L1DT watGqvhgsY0FLRh+aKdNzokl7fOv1ltFdTaq1hswLvUXvTLO6KRU/h713xCv3rl18Y zqUGniT2VjAo7ZUy7+tUIjF0YhaxpulqyB0gY/yvOuO3sqMJnzNLuPtOTlukCh8bB5 uNQfP7AmAsa5vxTAyzKBGWzd6JBsKa36/PggXOrgDOE9Ro1ojusXjvPsybd2bi7zbd mmD3MGfw5K23Q== 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. * gnu/packages/cdrom.scm (xorisso)[inputs]: Add 'bash-minimal'. (dvdstyler)[inputs]: Likewise. (abcde)[inputs]: Likewise. (asunder)[inputs]: Likewise. (cdemu-client)[inputs]: Likewise. --- gnu/packages/cdrom.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index de72cc0856..4919039d39 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages acl) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages compression) #:use-module (gnu packages flex) @@ -198,7 +199,8 @@ libcdio.") `("PATH" ":" prefix (,(string-append out "/bin")))) #t)))))) (inputs - `(("acl" ,acl) + `(("bash" ,bash-minimal) ; for wrap-program + ("acl" ,acl) ("readline" ,readline) ("tk" ,tk) ("zlib" ,zlib))) @@ -525,6 +527,7 @@ capacity is user-selectable.") (inputs ; TODO package bundled wxvillalib `(("wxwidgets" ,wxwidgets-3.1) ("wssvg" ,wxsvg) + ("bash" ,bash-minimal) ; for wrap-program ("dbus" ,dbus) ("cdrtools" ,cdrtools) ("dvd+rw-tools" ,dvd+rw-tools) @@ -681,7 +684,8 @@ from an audio CD.") #t))) #:tests? #f)) ; no test target - (inputs `(("wget" ,wget) + (inputs `(("bash" ,bash-minimal) ; for wrap-program + ("wget" ,wget) ("which" ,which) ("cdparanoia" ,cdparanoia) ("cd-discid" ,cd-discid) @@ -771,7 +775,8 @@ information is written to standard error.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) ;; TODO: Add the necessary packages for Musepack encoding. - (inputs `(("gtk+-2" ,gtk+-2) + (inputs `(("bash" ,bash-minimal) ; for wrap-program + ("gtk+-2" ,gtk+-2) ("glib" ,glib) ("libcddb" ,libcddb) ("cdparanoia" ,cdparanoia) @@ -1025,7 +1030,8 @@ drive and disc (including CD-ROMs and DVD-ROMs).") `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) (inputs - `(("python" ,python) + `(("bash" ,bash-minimal) ; for wrap-program + ("python" ,python) ("python-pygobject" ,python-pygobject) ("cdemu-daemon" ,cdemu-daemon))) (arguments