ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Maxim Cournoyer 2024-01-31 11:11:37 -05:00 committed by Ludovic Courtès
parent 84728d5ba4
commit 67b5b6b60e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/commencement.scm
View file

@ -3345,15 +3345,15 @@ (define-public ld-gold-wrapper
(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 @@ (define-public %final-inputs
("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)