diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-24 15:04:57 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-12-29 21:26:11 +0100 |
| commit | e51de34309be7ba8105be66d45d7da4a64883b08 (patch) | |
| tree | e02eae1937d2c0a93e860e1f886ced2a9c91bbb1 /guix/profiles.scm | |
| parent | 4befbe1a0e28fdb37c3fb11ab497636b783d61d6 (diff) | |
| download | patches-e51de34309be7ba8105be66d45d7da4a64883b08.tar patches-e51de34309be7ba8105be66d45d7da4a64883b08.tar.gz | |
profiles: Fix profile-derivation cross-compilation.
* guix/store.scm (current-target-system): New exported monadic procedure.
* guix/profiles.scm (profile-derivation): Set target at bind time using the
above procedure.
Diffstat (limited to 'guix/profiles.scm')
| -rw-r--r-- | guix/profiles.scm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm index 5b3b5bd5fe..0d38b2513f 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com> +;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1463,6 +1464,9 @@ are cross-built for TARGET." (mlet* %store-monad ((system (if system (return system) (current-system))) + (target (if target + (return target) + (current-target-system))) (ok? (if allow-collisions? (return #t) (check-for-collisions manifest system |