summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2026-02-23 12:41:26 +0100
committerZheng Junjie <z572@z572.online>2026-06-20 23:59:07 +0800
commit6bd3d72dc9d8c1f4f585d3ea3eca98d8da8d1f6e (patch)
treee93be7101c514f5b8d588e452483bf582ad2b8cf
parentd3f25557034b8720b83e1ec8f3881fa15fd7dbdf (diff)
gnu: make-gnu-make-final: Improve style, drop input labels.
* gnu/packages/commencement.scm (pkg-config, make-gnu-make-final) [arguments]: Improve style, drop quotes. [inputs]: Drop input labels. * gnu/packages/base.scm (gnu-make)[arguments]: Use G-expressions for configure-flags. Change-Id: I4d1c6e58c61e55291970920b723a1efee2eb4e8e Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/base.scm4
-rw-r--r--gnu/packages/commencement.scm16
2 files changed, 9 insertions, 11 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 73c83f771f7..d3e90c09708 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -618,8 +618,8 @@ standard.")
618 (arguments 618 (arguments
619 (append 619 (append
620 (if (target-hurd?) 620 (if (target-hurd?)
621 (list #:configure-flags '("CFLAGS=-D__alloca=alloca" 621 (list #:configure-flags #~(list "CFLAGS=-D__alloca=alloca"
622 "ac_cv_func_posix_spawn=no")) 622 "ac_cv_func_posix_spawn=no"))
623 (list)) 623 (list))
624 (list 624 (list
625 #:phases 625 #:phases
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fd8f6770d6e..d058a8a5295 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3537,19 +3537,17 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
3537 "Compute the final GNU Make, which uses the final Guile." 3537 "Compute the final GNU Make, which uses the final Guile."
3538 (let ((pkg-config (package 3538 (let ((pkg-config (package
3539 (inherit %pkg-config) ;the native pkg-config 3539 (inherit %pkg-config) ;the native pkg-config
3540 (inputs `(("guile" ,guile-final) 3540 (inputs (cons* guile-final (%boot5-inputs)))
3541 ,@(%boot5-inputs)))
3542 (arguments 3541 (arguments
3543 `(#:implicit-inputs? #f 3542 (cons* #:implicit-inputs? #f
3544 ,@(package-arguments %pkg-config)))))) 3543 (package-arguments %pkg-config))))))
3545 (package 3544 (package
3546 (inherit (package-with-bootstrap-guile gnu-make)) 3545 (inherit (package-with-bootstrap-guile gnu-make))
3547 (inputs `(("guile" ,guile-final) 3546 (inputs (cons* guile-final (%boot5-inputs)))
3548 ,@(%boot5-inputs))) 3547 (native-inputs (list pkg-config))
3549 (native-inputs `(("pkg-config" ,pkg-config)))
3550 (arguments 3548 (arguments
3551 `(#:implicit-inputs? #f 3549 (cons* #:implicit-inputs? #f
3552 ,@(package-arguments gnu-make)))))) 3550 (package-arguments gnu-make))))))
3553 3551
3554 3552
3555(define coreutils-final 3553(define coreutils-final