From patchwork Fri Jun 18 16:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30373 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 507DB27BC81; Fri, 18 Jun 2021 17:13:42 +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 16F9C27BC78 for ; Fri, 18 Jun 2021 17:13:42 +0100 (BST) Received: from localhost ([::1]:44708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH7l-0005Xj-4A for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:13:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5D-00008n-I8 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5D-00024c-6t for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5D-0002xh-2O for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 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 16:11:03 +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.162403261810962 (code B ref 49025); Fri, 18 Jun 2021 16:11:03 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:18 +0000 Received: from localhost ([127.0.0.1]:57717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4U-0002qV-9q for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:18 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4O-0002o5-DS for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:12 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gABLw; Fri, 18 Jun 2021 18:10:12 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:04 +0200 Message-Id: <20210618160936.18972-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032612; bh=7CCAUBNV9RJ5wmDTt8PN/AU2ubDq/YhEKCtv/jZqj2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=tCcn/73ysQWxESsj1nlDS/8X/VacufQuveSq6ekD6aVWuqMAFk+gxD+2WH3qjkq/B RdYT9LERQHhnlVjaNoeM1Yh0ySXdSWKf1nwwNE+88hFe051nJbBfcKeeWT0qVc3M7x 7VhgJMMphWU/W+jNmGnaFdNPAmml6sgpxp9amI17Tc1uRb6fp0yk7c4o2mK4A7h3zZ c0Pc0rGtjdnz5G5Z3JbzUzevz3MIHoNSk53j+A6pHZABnQayn/A5D2/QYfY4mddND6 NKfy+PZ1VMCuV4y8+tZ2joXbwIm8hoQMwfOpiAiKOdywuHY8LEvKrynclVgSEdZbrE 4YVadVIhTLwaQ== 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"