diff mbox series

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

Message ID 20210728141326.29770-1-othacehe@gnu.org
State Accepted
Headers show
Series [bug#49756,core-updates] build-system: asdf: Remove %build-inputs reference. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Mathieu Othacehe July 28, 2021, 2:13 p.m. UTC 
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(-)

Comments

Mathieu Othacehe July 28, 2021, 2:20 p.m. UTC | #1 
>                  #:select ((package-name->name+version
> -                           . hyphen-separated-name->name+version)))
> +                           . hyphen-separated-name->name+version)
> +                          search-input-file))

This hunk is not needed.

Mathieu
Ludovic Courtès July 29, 2021, 8:18 a.m. UTC | #2 
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’.
Mathieu Othacehe July 29, 2021, 8:29 a.m. UTC | #3 
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
diff mbox series

Patch

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