diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-03-02 13:43:13 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-02 14:47:07 +0100 |
commit | 7573d30ff804302eeb68edeca6ae5f3efb48b7bf (patch) | |
tree | d31a92b4672e04f0b598ddcf1184d66fc9a372b7 /guix/scripts/system.scm | |
parent | 1cbdf82d3ba5b257e44144788244139ae15689c8 (diff) | |
download | guix-patches-7573d30ff804302eeb68edeca6ae5f3efb48b7bf.tar guix-patches-7573d30ff804302eeb68edeca6ae5f3efb48b7bf.tar.gz |
guix build: Move '--no-grafts' to the common build options.
* guix/scripts/build.scm (%options): Move --no-grafts to...
(%standard-build-options): ... here.
(show-help, show-build-options-help): Adjust accordingly.
* guix/scripts/archive.scm (%default-options): Add 'graft?'.
(guix-archive): Parametrize '%graft?'.
* guix/scripts/environment.scm (%default-options): Add 'graft?'.
(guix-environment): Parametrize '%graft?'.
* guix/scripts/package.scm (%default-options): Add 'graft?'.
(guix-package): Parametrize '%graft?'.
* guix/scripts/system.scm (%default-options): Add 'graft?'.
(guix-system): Parametrize 'graft?'.
* doc/guix.texi (Additional Build Options): Move --no-grafts to...
(Common Build Options): ... here.
Diffstat (limited to 'guix/scripts/system.scm')
-rw-r--r-- | guix/scripts/system.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 401aa8b60a..9f56a96ca0 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -21,6 +21,7 @@ #:use-module (guix config) #:use-module (guix ui) #:use-module (guix store) + #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix derivations) #:use-module (guix packages) @@ -685,6 +686,7 @@ Build the operating system declared in FILE according to ACTION.\n")) ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) + (graft? . #t) (build-hook? . #t) (max-silent-time . 3600) (verbosity . 0) @@ -812,6 +814,7 @@ argument list and OPTS is the option alist." parse-sub-command)) (args (option-arguments opts)) (command (assoc-ref opts 'action))) - (process-command command args opts)))) + (parameterize ((%graft? (assoc-ref opts 'graft?))) + (process-command command args opts))))) ;;; system.scm ends here |