[bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

[bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

[Mathieu Othacehe]

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

[bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

[Mathieu Othacehe]

>                  #:select ((package-name->name+version
> -                           . hyphen-separated-name->name+version)))
> +                           . hyphen-separated-name->name+version)
> +                          search-input-file))

This hunk is not needed.

Mathieu

[bug#49756] [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

[Ludovic Courtès]

Hi,

Mathieu Othacehe <othacehe@gnu.org> skribis:

> This is a follow-up of 7d873f194ca69d6096d28d7a224ab78e83e34fe1 that removes
> the %build-inputs variable.
>
> * guix/build-system/asdf.scm (asdf-build): Remove %build-inputs reference.

LGTM! (modulo the unnecessary hunk)

Note that I left ‘%build-inputs’ in the “main” build systems, but
semi-intentionally left it out in other build systems, the idea being
that we should no longer need it now, and it was already rarely used.

Thanks,
Ludo’.

bug#49756: [PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

[Mathieu Othacehe]

Hey,

> Note that I left ‘%build-inputs’ in the “main” build systems, but
> semi-intentionally left it out in other build systems, the idea being
> that we should no longer need it now, and it was already rarely used.

I see, thanks for explaining!

Closing this one,

Mathieu