From patchwork Wed Mar 30 01:45:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Kubisiak X-Patchwork-Id: 38210 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 5575A27BBEA; Wed, 30 Mar 2022 02:47:19 +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.9 required=5.0 tests=BAYES_00,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 1A45E27BBE9 for ; Wed, 30 Mar 2022 02:47:19 +0100 (BST) Received: from localhost ([::1]:51358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZNQc-0000x2-70 for patchwork@mira.cbaines.net; Tue, 29 Mar 2022 21:47:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZNQN-0000wr-NR for guix-patches@gnu.org; Tue, 29 Mar 2022 21:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40104) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZNQM-0004Of-ES for guix-patches@gnu.org; Tue, 29 Mar 2022 21:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZNQM-0005wy-DP for guix-patches@gnu.org; Tue, 29 Mar 2022 21:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54618] [PATCH v2] gnu: lbzip2: Fix cross-compilation. References: <20220329013641.gfixewbrmu2qkz34@peregrine> In-Reply-To: <20220329013641.gfixewbrmu2qkz34@peregrine> Resent-From: Brian Kubisiak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 01:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54618@debbugs.gnu.org Received: via spool by 54618-submit@debbugs.gnu.org id=B54618.164860477022801 (code B ref 54618); Wed, 30 Mar 2022 01:47:02 +0000 Received: (at 54618) by debbugs.gnu.org; 30 Mar 2022 01:46:10 +0000 Received: from localhost ([127.0.0.1]:34001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZNPW-0005vh-BI for submit@debbugs.gnu.org; Tue, 29 Mar 2022 21:46:10 -0400 Received: from mn-69-69-108-139.sta.embarqhsd.net ([69.69.108.139]:2965 helo=mail.kubisiak.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZNPR-0005uy-QY for 54618@debbugs.gnu.org; Tue, 29 Mar 2022 21:46:09 -0400 Received: from peregrine (108-237-41-25.lightspeed.sntcca.sbcglobal.net [108.237.41.25]) by mail.kubisiak.com with ESMTPSA (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256) ; Tue, 29 Mar 2022 20:45:53 -0500 Date: Tue, 29 Mar 2022 18:45:55 -0700 From: Brian Kubisiak Message-ID: <20220330014555.tucyos5b36qxzmd5@peregrine> MIME-Version: 1.0 Content-Disposition: inline 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 * gnu/packages/compression.scm (lbzip2)[arguments]: Search (or native-inputs inputs) for gnulib-tool.py. --- gnu/packages/compression.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3edaecd951..e1d8f721a3 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -411,8 +411,10 @@ (define-public lbzip2 `(#:phases (modify-phases %standard-phases (add-after 'unpack 'unpack-gnulib - (lambda* (#:key inputs #:allow-other-keys) - (let ((gnulib (assoc-ref inputs "gnulib"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((gnulib + (dirname (search-input-file (or native-inputs inputs) + "gnulib-tool.py")))) (copy-recursively gnulib "lib") (setenv "PATH" (string-append "lib:" (getenv "PATH"))) #t)))