From patchwork Fri Jun 18 17:15:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30413 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 0662527BC81; Fri, 18 Jun 2021 18:20:18 +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 CCE4527BC78 for ; Fri, 18 Jun 2021 18:20:17 +0100 (BST) Received: from localhost ([::1]:49300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAC-0007d1-Sx for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:20:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA0-0007az-Sj for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA0-00047r-LC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA0-0004ru-I6 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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: Fri, 18 Jun 2021 17:20:04 +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 Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403675618327 (code B ref 49025); Fri, 18 Jun 2021 17:20:04 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:16 +0000 Received: from localhost ([127.0.0.1]:57998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004lL-VC for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI96-0004j8-F0 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:09 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hK7bG; Fri, 18 Jun 2021 19:19:07 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:15:59 +0200 Message-Id: <20210618171631.20534-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036747; bh=7CCAUBNV9RJ5wmDTt8PN/AU2ubDq/YhEKCtv/jZqj2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=AOtdfXIon3C9JHpOl8b8yvP1XqbbcetuvCS64AZ5U/luckKjpoeMgYcn7dnOOtGqL Pn6LEgQt0eGFRqK/UcKHJ9JrAYyCeDLWm17QIQSDo1ZWCODVpSDXrltoqA25TvoNoV Omt165w6SRePmtSS8EC/0KZSLSiLqVrSPJ9bh5oDgVpyCrPjAQ+nrH1oC7nqexjAw9 dfpPaSj+dPdLKXoHCd5b7pgFOWoxDGwOq3tC/u6Fe6mie4asjWO9H+JzxdLykIC/gA PNRRiBjMdyi3pyMrrYQviW/7yeVlgOrGhkJyplSDQsajZvFTwFGKCjl4FarTKEwNrR El8cgM5/83YTw== 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: , Reply-To: 49025@debbugs.gnu.org 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"