From patchwork Fri Jul 2 10:06:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30966 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 B3BAE27BC81; Fri, 2 Jul 2021 11:17:32 +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 62F4A27BC78 for ; Fri, 2 Jul 2021 11:17:32 +0100 (BST) Received: from localhost ([::1]:54890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGEl-0000FJ-DR for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:17:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6m-0007Zx-UG for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6l-0004S0-Hb for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6l-0008Mh-B7 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 016/128] gnu: engineering: 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:15 +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.162522054431939 (code B ref 49327); Fri, 02 Jul 2021 10:09:15 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:04 +0000 Received: from localhost ([127.0.0.1]:34454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6Z-0008Im-Jf for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:04 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6J-0008C0-MP for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:48 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8nCa; Fri, 02 Jul 2021 12:08:47 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:22 +0200 Message-Id: <20210702100814.23249-16-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=1625220527; bh=0+9FQxLlvmv7oC/ARFTShSvo7+5cu2G5oCRwaCvJPT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nDcgfbTWb4RpDaIuPICqBEFNgsJF14Jx47VqDxfh4Iv7VOxOEr34eMLnJ/nJ/Cb9W BA8NvgjK802OwCZed3aa+9kyad61p/0FGmQos5lad5oaAjlSf61jDZ8idVh2CpMb1q kfFJqHCE+H9GgyAB5LuE9MK9GUCO8oaBpWxqDz273uRb57ip4IraxXIcsPUyrB9NiD YF9/reArQlut3T3/oiO5tkR8rckyUq8LonGZEKauipFq1Wug3nP2L2QfSEirCXUjWS tpMRBCASj5axTk3ygczngYDjiWnpzpTS3R9VNv8sPU337W4ClQNM53IwuX4eIbJKL5 KkX3JSyJ70TBQ== 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/engineering.scm (librecad)[inputs]: Add 'bash-minimal'. (pcb)[inputs]: Likewise. (kicad)[inputs]: Likewise. (volk)[inputs]: Likewise. (freehdl)[inputs]: Likewise. (freecad)[inputs]: Likewise. --- gnu/packages/engineering.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 338510d813..a9829b5be2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.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 bdw-gc) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -198,7 +199,8 @@ qt))) #t)))))) (inputs - `(("boost" ,boost) + `(("bash" ,bash-minimal) ; for wrap-program + ("boost" ,boost) ("muparser" ,muparser) ("freetype" ,freetype) ("qtbase" ,qtbase) @@ -447,7 +449,8 @@ features."))) (setenv "DISPLAY" ":1") #t))))) (inputs - `(("dbus" ,dbus) + `(("bash" ,bash-minimal) ; for wrap-program + ("dbus" ,dbus) ("mesa" ,mesa) ("udev" ,eudev) ;FIXME: required by mesa ("glu" ,glu) @@ -979,7 +982,8 @@ Emacs).") ("swig" ,swig) ("zlib" ,zlib))) (inputs - `(("cairo" ,cairo) + `(("bash" ,bash-minimal) ; for wrap-program + ("cairo" ,cairo) ("curl" ,curl) ("glew" ,glew) ("glm" ,glm) @@ -1218,7 +1222,8 @@ the 'showing the effect of'-style of operation.") (,(string-append python "/bin:"))))) #t))))) (inputs - `(("boost" ,boost) + `(("bash" ,bash-minimal) ; for wrap-program + ("boost" ,boost) ("python" ,python-wrapper) ("python-mako" ,python-mako))) (home-page "https://www.libvolk.org/") @@ -2017,7 +2022,8 @@ parallel computing platforms. It also supports serial execution.") `("PKG_CONFIG_PATH" ":" prefix (,(string-append out "/lib/pkgconfig"))))) #t))))) (inputs - `(("coreutils" ,coreutils) + `(("bash" ,bash-minimal) ; for wrap-program + ("coreutils" ,coreutils) ("gcc-toolchain" ,gcc-toolchain) ("guile" ,guile-2.2) ("perl" ,perl) @@ -2390,7 +2396,8 @@ comments."))) ("python-pyside-2-tools" ,python-pyside-2-tools) ("swig" ,swig))) (inputs - `(("boost" ,boost) + `(("bash" ,bash-minimal) ; for wrap-program + ("boost" ,boost) ("coin3D" ,coin3D) ("double-conversion" ,double-conversion) ("eigen" ,eigen)