civodul pushed a commit to branch master
in repository guix.
commit f42f39ad68354d19c63222a9630c6e340843aa86
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu Mar 5 15:52:37 2020 +0100
guix build: Parameterize '%graft?' upfront.
* guix/scripts/build.scm (guix-build): Add 'graft?' variable and
parameterize %GRAFT?.
---
guix/scripts/build.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 5c690cb..da2a675 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -943,13 +943,21 @@ needed."
(parse-command-line args %options
(list %default-options)))
+ (define graft?
+ (assoc-ref opts 'graft?))
+
(with-error-handling
(with-status-verbosity (assoc-ref opts 'verbosity)
(with-store store
;; Set the build options before we do anything else.
(set-build-options-from-command-line store opts)
- (parameterize ((current-terminal-columns (terminal-columns)))
+ (parameterize ((current-terminal-columns (terminal-columns))
+
+ ;; Set grafting upfront in case the user's input
+ ;; depends on it (e.g., a manifest or code snippet that
+ ;; calls 'gexp->derivation').
+ (%graft? graft?))
(let* ((mode (assoc-ref opts 'build-mode))
(drv (options->derivations store opts))
(urls (map (cut string-append <> "/log")
