From patchwork Tue Mar 29 01:36:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Kubisiak X-Patchwork-Id: 38168 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 1FD3427BBEA; Tue, 29 Mar 2022 02:37: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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 DDD2327BBE9 for ; Tue, 29 Mar 2022 02:37:17 +0100 (BST) Received: from localhost ([::1]:39572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZ0nN-000257-1A for patchwork@mira.cbaines.net; Mon, 28 Mar 2022 21:37:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ0nA-00024w-Gf for guix-patches@gnu.org; Mon, 28 Mar 2022 21:37:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37338) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZ0n8-0007bP-F4 for guix-patches@gnu.org; Mon, 28 Mar 2022 21:37:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZ0n8-0003Qn-CH for guix-patches@gnu.org; Mon, 28 Mar 2022 21:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54618] [PATCH] gnu: lbzip2: Fix cross-compilation. Resent-From: Brian Kubisiak Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 01:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54618@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164851781613172 (code B ref -1); Tue, 29 Mar 2022 01:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Mar 2022 01:36:56 +0000 Received: from localhost ([127.0.0.1]:59468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0n2-0003QO-4b for submit@debbugs.gnu.org; Mon, 28 Mar 2022 21:36:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:37442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ0n1-0003QH-7B for submit@debbugs.gnu.org; Mon, 28 Mar 2022 21:36:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ0n0-00024F-1Q for guix-patches@gnu.org; Mon, 28 Mar 2022 21:36:55 -0400 Received: from mn-69-69-108-139.sta.embarqhsd.net ([69.69.108.139]:1248 helo=mail.kubisiak.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZ0my-0007ZK-II for guix-patches@gnu.org; Mon, 28 Mar 2022 21:36:53 -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) ; Mon, 28 Mar 2022 20:36:45 -0500 Date: Mon, 28 Mar 2022 18:36:41 -0700 From: Brian Kubisiak Message-ID: <20220329013641.gfixewbrmu2qkz34@peregrine> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=69.69.108.139; envelope-from=brian@kubisiak.com; helo=mail.kubisiak.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, PDS_RDNS_DYNAMIC_FP=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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]: Add (or native-inputs inputs) to ASSOC-REF. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3edaecd951..34e9fa49de 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -411,8 +411,8 @@ (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 (assoc-ref (or native-inputs inputs) "gnulib"))) (copy-recursively gnulib "lib") (setenv "PATH" (string-append "lib:" (getenv "PATH"))) #t)))