02/02: gnu: gnu-make-final: Turn into a procedure to delay top-level evaluation.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit c41121d604ac3cbbe0a24e94c0fbc3b599eb537b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 31 11:11:37 2024 -0500

    gnu: gnu-make-final: Turn into a procedure to delay top-level evaluation.
    
    This was causing a problem with the pkg-config syntax being evaluated too
    early.
    
    * gnu/packages/commencement.scm (gnu-make-final): Rename to...
    (make-gnu-make-final): ... this, turning it into a procedure.  Also use
    %pkg-config to avoid more problems caused by pulling the special pkg-config
    syntax.
    (%final-inputs): Adjust accordingly.
    
    Change-Id: Icf1d0e106a109afc8e121d5dcfff07df8d5dd1df
---
 gnu/packages/commencement.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 304149cabd..af262bdc07 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3345,15 +3345,15 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker 
-Wl,~a/~a \"$@\"~%"
 (define %boot5-inputs %boot4-inputs)
 (define with-boot5 with-boot4)
 
-(define gnu-make-final
-  ;; The final GNU Make, which uses the final Guile.
+(define (make-gnu-make-final)
+  "Compute the final GNU Make, which uses the final Guile."
   (let ((pkg-config (package
                       (inherit %pkg-config)       ;the native pkg-config
                       (inputs `(("guile" ,guile-final)
                                 ,@(%boot5-inputs)))
                       (arguments
                        `(#:implicit-inputs? #f
-                         ,@(package-arguments pkg-config))))))
+                         ,@(package-arguments %pkg-config))))))
     (package
       (inherit (package-with-bootstrap-guile gnu-make))
       (inputs `(("guile" ,guile-final)
@@ -3442,7 +3442,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"$@\"~%"
           ("grep" ,grep-final)
           ("xz" ,xz-final)
           ("coreutils" ,coreutils-final)
-          ("make" ,gnu-make-final)
+          ("make" ,(make-gnu-make-final))
           ("bash" ,bash-final)
           ("ld-wrapper" ,ld-wrapper)
           ("binutils" ,binutils-final)