diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-07-31 23:27:03 -0400 |
| commit | 3d337bbc3916b95c0197ebbb890875f0439eec53 (patch) | |
| tree | ffd4098c3ec8e7af659f2e70448e45180b2a7cfb /emacs | |
| parent | 932b2ea2064ec8ab8e81b959bd92f6138974fd39 (diff) | |
| parent | 4e8efc15fb9082fb80726a2a37c4e6ebb13552fa (diff) | |
| download | guix-3d337bbc3916b95c0197ebbb890875f0439eec53.tar guix-3d337bbc3916b95c0197ebbb890875f0439eec53.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/guix-main.scm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index cbf7cdc474..040932f307 100644 --- a/emacs/guix-main.scm +++ b/emacs/guix-main.scm @@ -46,6 +46,7 @@ (guix) (guix combinators) (guix git-download) + (guix grafts) (guix packages) (guix profiles) (guix licenses) @@ -930,15 +931,16 @@ OUTPUTS is a list of package outputs (may be an empty list)." (new-manifest (manifest-perform-transaction manifest transaction))) (unless (and (null? install) (null? remove)) - (with-store store - (set-build-options store - #:print-build-trace #f - #:use-substitutes? use-substitutes?) - (show-manifest-transaction store manifest transaction - #:dry-run? dry-run?) - (build-and-use-profile store profile new-manifest - #:use-substitutes? use-substitutes? - #:dry-run? dry-run?))))) + (parameterize ((%graft? (not dry-run?))) + (with-store store + (set-build-options store + #:print-build-trace #f + #:use-substitutes? use-substitutes?) + (show-manifest-transaction store manifest transaction + #:dry-run? dry-run?) + (build-and-use-profile store profile new-manifest + #:use-substitutes? use-substitutes? + #:dry-run? dry-run?)))))) (define (delete-generations* profile generations) "Delete GENERATIONS from PROFILE. |