From 72a99ff1a72c00d2b7a29f203b38cb4ec1c6fc34 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 19 Oct 2025 12:16:28 +0900 Subject: [PATCH] gnu: Add pkg-config-final. * gnu/packages/commencement.scm (pkg-config-final): New package. (make-gnu-make-final): Use it. Change-Id: I1452a09e765de863ac9725ac7924a0a97d3010ca --- gnu/packages/commencement.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3181008e099b9f2c65c64bbb378072d5e2044efd..c3731b3bc37f6bde5ac199723c9cb141f0a28f6d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3511,24 +3511,26 @@ 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 pkg-config-final + (package + (inherit %pkg-config) ;the native pkg-config + (arguments + (ensure-keyword-arguments + (package-arguments %pkg-config) + (list #:implicit-inputs? #f + #:guile %bootstrap-guile))) + (inputs (%boot2-inputs)))) + (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 - (inherit (package-with-bootstrap-guile gnu-make)) - (inputs `(("guile" ,guile-final) - ,@(%boot5-inputs))) - (native-inputs `(("pkg-config" ,pkg-config))) - (arguments - `(#:implicit-inputs? #f - ,@(package-arguments gnu-make)))))) - + (package + (inherit (package-with-bootstrap-guile gnu-make)) + (inputs `(("guile" ,guile-final) + ,@(%boot5-inputs))) + (native-inputs `(("pkg-config" ,pkg-config-final))) + (arguments + `(#:implicit-inputs? #f + ,@(package-arguments gnu-make))))) (define coreutils-final ;; The final Coreutils. Treat them specially because some packages, such as