diff options
| author | Timothy Sample <samplet@ngyro.com> | 2021-02-06 13:31:15 -0500 |
|---|---|---|
| committer | Timothy Sample <samplet@ngyro.com> | 2022-03-19 13:33:06 -0600 |
| commit | 5268bd97b15f0f2ebf7b5a74ccbc84d9f6462921 (patch) | |
| tree | 2b0426dce3dcd693ff7633b1f3fe65de3786d6c5 /guix/build/gnu-bootstrap.scm | |
| parent | 4c19c3eb0698ef7baf9c75030c4dc0803f5f9d6f (diff) | |
gnu-bootstrap: Configure PACKAGE_NAME.
* guix/build/gnu-bootstrap.scm (bootstrap-configure): Add a 'name'
argument and use it to configure the PACKAGE_NAME variable.
* gnu/packages/commencement.scm (bootar, gash-boot,
gash-utils-boot): Use the new argument.
Diffstat (limited to 'guix/build/gnu-bootstrap.scm')
| -rw-r--r-- | guix/build/gnu-bootstrap.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm index 1cb9dc5512..7ca6ae8458 100644 --- a/guix/build/gnu-bootstrap.scm +++ b/guix/build/gnu-bootstrap.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com> +;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,12 +30,12 @@ bootstrap-build bootstrap-install)) -(define (bootstrap-configure version modules scripts) +(define (bootstrap-configure name version modules scripts) "Create a procedure that configures an early bootstrap package. The procedure will search the MODULES directory and configure all of the -'.in' files with VERSION. It will then search the SCRIPTS directory and -configure all of the '.in' files with the bootstrap Guile and its module -and object directories." +'.in' files with NAME and VERSION. It will then search the SCRIPTS +directory and configure all of the '.in' files with the bootstrap +Guile and its module and object directories." (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (guile-dir (assoc-ref inputs "guile")) @@ -50,6 +50,7 @@ and object directories." (let ((target (string-drop-right template 3))) (copy-file template target) (substitute* target + (("@PACKAGE_NAME@") name) (("@VERSION@") version)))) (find-files modules (lambda (fn st) |