From patchwork Wed Jul 28 14:13:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 31636 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 8D1D927BC78; Wed, 28 Jul 2021 15:14:09 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 282B727BC6B for ; Wed, 28 Jul 2021 15:14:09 +0100 (BST) Received: from localhost ([::1]:58072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8kK0-0002Wi-4G for patchwork@mira.cbaines.net; Wed, 28 Jul 2021 10:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8kJu-0002WD-D4 for guix-patches@gnu.org; Wed, 28 Jul 2021 10:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m8kJu-0006nz-5q for guix-patches@gnu.org; Wed, 28 Jul 2021 10:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m8kJu-0000Eo-2u for guix-patches@gnu.org; Wed, 28 Jul 2021 10:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 28 Jul 2021 14:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49756@debbugs.gnu.org Cc: Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1627481625877 (code B ref -1); Wed, 28 Jul 2021 14:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2021 14:13:45 +0000 Received: from localhost ([127.0.0.1]:55551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m8kJd-0000E5-C7 for submit@debbugs.gnu.org; Wed, 28 Jul 2021 10:13:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:44962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m8kJc-0000Dy-LT for submit@debbugs.gnu.org; Wed, 28 Jul 2021 10:13:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m8kJc-00023l-FR for guix-patches@gnu.org; Wed, 28 Jul 2021 10:13:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55804) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m8kJc-0006dL-7t for guix-patches@gnu.org; Wed, 28 Jul 2021 10:13:44 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=43842 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m8kJb-0007bM-W3; Wed, 28 Jul 2021 10:13:44 -0400 From: Mathieu Othacehe Date: Wed, 28 Jul 2021 16:13:26 +0200 Message-Id: <20210728141326.29770-1-othacehe@gnu.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 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 This is a follow-up of 7d873f194ca69d6096d28d7a224ab78e83e34fe1 that removes the %build-inputs variable. * guix/build-system/asdf.scm (asdf-build): Remove %build-inputs reference. --- Hello, This fixes the asdf based builds on core-updates. Thanks, Mathieu guix/build-system/asdf.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 79de2ee5ba..f4ad7252df 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -28,7 +28,8 @@ #:use-module (guix search-paths) #:use-module ((guix build utils) #:select ((package-name->name+version - . hyphen-separated-name->name+version))) + . hyphen-separated-name->name+version) + search-input-file)) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) @@ -295,9 +296,9 @@ set up using CL source package conventions." (with-imported-modules imported-modules #~(begin (use-modules #$@(sexp->gexp modules)) - (parameterize ((%lisp (string-append - (assoc-ref %build-inputs #$lisp-type) - "/bin/" #$lisp-type)) + (parameterize ((%lisp (search-input-file + #$(input-tuples->gexp inputs) + (string-append "bin/" #$lisp-type))) (%lisp-type #$lisp-type)) (asdf-build #:name #$name #:source #+source