From patchwork Fri Jul 2 10:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30984 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 045A927BC81; Fri, 2 Jul 2021 11:19: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 C95CF27BC78 for ; Fri, 2 Jul 2021 11:19:28 +0100 (BST) Received: from localhost ([::1]:59606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGGd-0003fy-Jd for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG74-00082A-VS for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:34 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG74-0004ew-MY for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG74-0008U3-IE for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:34 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 031/128] gnu: geo: 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:34 +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.162522056832469 (code B ref 49327); Fri, 02 Jul 2021 10:09:34 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:09:28 +0000 Received: from localhost ([127.0.0.1]:34628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6x-0008RW-Kp for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:09:27 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6O-0008C2-GH for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:58 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8sDV; Fri, 02 Jul 2021 12:08:52 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:37 +0200 Message-Id: <20210702100814.23249-31-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=1625220532; bh=CCbl+s0scWTiTD+p6eRHFjrlh2LhFSTsW/nnuPDJiwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nMONEfNIHFf+q2WU7zztHQeTVUwTJH4wZoXrfT5IKryCPcx8M2VAbH8NvXsOmvLjh XXBWLzAzjtKm5wOy5Olleo2Wk79G/lxyOT23ScK6C/RZGQHFL3go4cQCmHequN5e+Q jynYzYeoVphnDCpbUfuSW16hDE53LBWwNwzNVxZdg/Ip+Pj0RbQbG0hljUIG3585TD 8Q6Ly6H+vi0DHLR7c2yfGs9EuASn+1uTvBkQiDrWIdXR+n6A4uZFxpRWi6SjcniPht 6mtitJPGQTI2Xr6r/zTm7C6W17ngRc6JyVeXPfYQFoDY6MZiOgEhZOUf4RA66oDqT5 DzwuY1hDR/AsQ== 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/geo.scm (gnome-maps)[inputs]: Add 'bash-minimal'. (qmapshack)[inputs]: Likewise. (grass)[inputs]: Likewise. (qgis)[inputs]: Likewise. --- gnu/packages/geo.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 65b763ecbe..48c34ffb14 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -267,7 +267,8 @@ topology functions.") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs - `(("evolution-data-server" ,evolution-data-server) + `(("bash" ,bash-minimal) ; for wrap-program + ("evolution-data-server" ,evolution-data-server) ("folks" ,folks) ("libchamplain" ,libchamplain) ("libgee" ,libgee) @@ -1660,7 +1661,8 @@ using the dataset of topographical information collected by `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) (inputs - `(("gdal" ,gdal) + `(("bash" ,bash-minimal) ; for wrap-program + ("gdal" ,gdal) ("libjpeg-turbo" ,libjpeg-turbo) ("proj" ,proj) ("qtbase" ,qtbase) @@ -1904,7 +1906,8 @@ track your position right from your laptop.") (base32 "0dzzhgcsrszzinvjir50nvzq873b8gsp0p9k8fvcrv14amkbnnd3")))) (build-system gnu-build-system) (inputs - `(("bzip2" ,bzip2) + `(("bash" ,bash-minimal) ; for wrap-program + ("bzip2" ,bzip2) ("cairo" ,cairo) ("fftw" ,fftw) ("freetype" ,freetype) @@ -2248,7 +2251,8 @@ growing set of geoscientific methods.") `("GISBASE" = (,grass)))) #t))))) (inputs - `(("exiv2" ,exiv2) + `(("bash" ,bash-minimal) ; for wrap-program + ("exiv2" ,exiv2) ("expat" ,expat) ("gdal" ,gdal) ("geos" ,geos)