guix_mirror_bot pushed a commit to branch master
in repository guix.
commit e983b65c8dee879a03230e7c796a87204f042f23
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu Oct 30 16:20:04 2025 +0900
Revert "gnu: Add pkg-config-final."
This reverts commit 72a99ff1a72c00d2b7a29f203b38cb4ec1c6fc34.
---
gnu/packages/commencement.scm | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c3731b3bc3..3181008e09 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3511,26 +3511,24 @@ 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."
- (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)))))
+ (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))))))
+
(define coreutils-final
;; The final Coreutils. Treat them specially because some packages, such as
