mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-16 19:57:39 -05:00
guix build: Parameterize '%graft?' upfront.
* guix/scripts/build.scm (guix-build): Add 'graft?' variable and parameterize %GRAFT?.
This commit is contained in:
parent
c5a3d8f646
commit
f42f39ad68
1 changed files with 9 additions and 1 deletions
|
@ -943,13 +943,21 @@ (define opts
|
||||||
(parse-command-line args %options
|
(parse-command-line args %options
|
||||||
(list %default-options)))
|
(list %default-options)))
|
||||||
|
|
||||||
|
(define graft?
|
||||||
|
(assoc-ref opts 'graft?))
|
||||||
|
|
||||||
(with-error-handling
|
(with-error-handling
|
||||||
(with-status-verbosity (assoc-ref opts 'verbosity)
|
(with-status-verbosity (assoc-ref opts 'verbosity)
|
||||||
(with-store store
|
(with-store store
|
||||||
;; Set the build options before we do anything else.
|
;; Set the build options before we do anything else.
|
||||||
(set-build-options-from-command-line store opts)
|
(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))
|
(let* ((mode (assoc-ref opts 'build-mode))
|
||||||
(drv (options->derivations store opts))
|
(drv (options->derivations store opts))
|
||||||
(urls (map (cut string-append <> "/log")
|
(urls (map (cut string-append <> "/log")
|
||||||
|
|
Loading…
Reference in a new issue