unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Mathieu Othacehe <othacehe@gnu.org>
To: 49756@debbugs.gnu.org
Cc: Mathieu Othacehe <othacehe@gnu.org>
Subject: [bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.
Date: Wed, 28 Jul 2021 16:13:26 +0200	[thread overview]
Message-ID: <20210728141326.29770-1-othacehe@gnu.org> (raw)

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
-- 
2.32.0





             reply	other threads:[~2021-07-28 14:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28 14:13 Mathieu Othacehe [this message]
2021-07-28 14:20 ` [bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference Mathieu Othacehe
2021-07-29  8:18 ` Ludovic Courtès
2021-07-29  8:29   ` bug#49756: " Mathieu Othacehe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210728141326.29770-1-othacehe@gnu.org \
    --to=othacehe@gnu.org \
    --cc=49756@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).