summaryrefslogtreecommitdiff
path: root/guix/scripts/package.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-03-02 13:43:13 +0100
committerLudovic Courtès <ludo@gnu.org>2016-03-02 14:47:07 +0100
commit7573d30ff804302eeb68edeca6ae5f3efb48b7bf (patch)
treed31a92b4672e04f0b598ddcf1184d66fc9a372b7 /guix/scripts/package.scm
parent1cbdf82d3ba5b257e44144788244139ae15689c8 (diff)
downloadgnu-guix-7573d30ff804302eeb68edeca6ae5f3efb48b7bf.tar
gnu-guix-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/package.scm')
-rw-r--r--guix/scripts/package.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index f65834386b..1d88b33996 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -22,6 +22,7 @@
(define-module (guix scripts package)
#:use-module (guix ui)
#:use-module (guix store)
+ #:use-module (guix grafts)
#:use-module (guix derivations)
#:use-module (guix packages)
#:use-module (guix profiles)
@@ -319,6 +320,7 @@ ENTRIES, a list of manifest entries, in the context of PROFILE."
;; Alist of default option values.
`((max-silent-time . 3600)
(verbosity . 0)
+ (graft? . #t)
(substitutes? . #t)))
(define (show-help)
@@ -837,7 +839,8 @@ processed, #f otherwise."
#:argument-handler handle-argument)))
(with-error-handling
(or (process-query opts)
- (parameterize ((%store (open-connection)))
+ (parameterize ((%store (open-connection))
+ (%graft? (assoc-ref opts 'graft?)))
(set-build-options-from-command-line (%store) opts)
(parameterize ((%guile-for-build