From patchwork Mon Jun 14 15:38:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30241 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 DC4AE27BC81; Mon, 14 Jun 2021 16:47:28 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 AA57027BC78 for ; Mon, 14 Jun 2021 16:47:28 +0100 (BST) Received: from localhost ([::1]:54876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsooB-0006rp-OD for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog3-0002xq-Bs for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog3-0007jH-26 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog2-0004Ir-Uy for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 05/37] net-base: Fix cross-compilation, eliminating %build-inputs & friends Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368510316400 (code B ref 49025); Mon, 14 Jun 2021 15:39:02 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:23 +0000 Received: from localhost ([127.0.0.1]:47577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofP-0004GM-5L for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:23 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofL-0004Ah-PZ for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:20 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3eK2500B0mfAB4063eKFS; Mon, 14 Jun 2021 17:38:19 +0200 Message-ID: <1d2e246e4d21a5b3d7b4232478d51b04bbf9434e.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:19 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685099; bh=r4nFZNWcGI3MO/Oqsl7UNynuqHxLQ4x318YLbObD7zA=; h=Subject:From:To:Date:In-Reply-To:References; b=JLVeY3WOPqETBVBCNdWJmt+VJME2OKHemYWkL2zqpmUeib5sVjEwS5MiOSD6NoN9T l+YmO/cPkIWwjDzxgg3wgqFtXUD0sZi21Q6+9Yi8NPrLtGjMTI4CLADU0v/o3qHy6a F22hZ/bgiE3zYguNK171XCzmROrVNgjKVK+wdYRTSROHkKV+4e2gGFGaIYByh3e3zo 44FTuDz5mGtABKuEDjEPtB1lwYgLgtOcZLrzauAgNilFOLN9ZAuk50gJnh6q6DPW96 Rf3tG85VZh+DjvPawCqSMBCTN/FJ4rSHaYtoAeAoBoJbru0YDL+lFCBEpawsDkgFbJ D4RJvtMU+SSKQ== 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 "source" is not in %build-inputs when cross-compiling, so another approach for referring to the package source code is needed. * gnu/packages/admin.scm (net-base)[arguments]<#:builder>: Eliminate %build-inputs and %outputs. --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5c7e41f51b..f499a1252b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -941,10 +941,10 @@ to allow automatic login and starting any app.") (use-modules (guix build utils) (srfi srfi-26)) - (let* ((source (assoc-ref %build-inputs "source")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) - (output (assoc-ref %outputs "out")) + (let* ((source #+(package-source this-package)) + (tar #+(this-package-native-input "tar")) + (xz #+(this-package-native-input "xz")) + (output #$output) (etc (string-append output "/etc"))) (setenv "PATH" (string-append xz "/bin")) (invoke (string-append tar "/bin/tar") "xvf"