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 /guix | |
| parent | 932b2ea2064ec8ab8e81b959bd92f6138974fd39 (diff) | |
| parent | 4e8efc15fb9082fb80726a2a37c4e6ebb13552fa (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/scripts.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/guix/scripts.scm b/guix/scripts.scm index d84375f570..bbee50bc3d 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Deck Pickard <deck.r.pickard@gmail.com> -;;; Copyright © 2015 Alex Kost <alezost@gmail.com> +;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (guix scripts) + #:use-module (guix grafts) #:use-module (guix utils) #:use-module (guix ui) #:use-module (guix store) @@ -105,11 +106,13 @@ true." #:rest build-options) "Build PACKAGE using BUILD-OPTIONS acceptable by 'set-build-options'. Show what and how will/would be built." - (mbegin %store-monad + (mlet %store-monad ((grafting? ((lift0 %graft? %store-monad)))) (apply set-build-options* #:use-substitutes? use-substitutes? (strip-keyword-arguments '(#:dry-run?) build-options)) - (mlet %store-monad ((derivation (package->derivation package))) + (mlet %store-monad ((derivation (package->derivation + package #:graft? (and (not dry-run?) + grafting?)))) (mbegin %store-monad (maybe-build (list derivation) #:use-substitutes? use-substitutes? |