diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-06-16 21:34:48 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-06-16 21:44:33 -0400 |
| commit | 375d5d03c91e722c1fcf17d456c303c53b0b5a80 (patch) | |
| tree | 7d4e6debb7097cd30e9c9d65b86bc71a3f147050 /guix/scripts | |
| parent | 20ab92719e24b4286aeee715cd9bd07315708a82 (diff) | |
| download | guix-patches-375d5d03c91e722c1fcf17d456c303c53b0b5a80.tar guix-patches-375d5d03c91e722c1fcf17d456c303c53b0b5a80.tar.gz | |
pack: Fix the system value passed to build-docker-image.
Before this change, the system value would be passed as x86_64 when using a
i686-linux emulated system, e.g.:
$ guix environment --system=i686-linux --ad-hoc guile -- \
guile -c '(display (utsname:machine (uname))) (newline)'
x86_64
This change uses the Guile builtin %host-type variable, which doesn't have
this problem:
$ guix environment --system=i686-linux --ad-hoc guile -- \
guile -c '(display %host-type) (newline)'
i686-unknown-linux-gnu
* guix/scripts/pack.scm (docker-image)[#:system] Use %host-type as a fall-back
when target is not defined.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/pack.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index b653138f2c..8cb4e6d2cc 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -610,7 +610,7 @@ the image." #$profile #:repository tag #:database #+database - #:system (or #$target (utsname:machine (uname))) + #:system (or #$target %host-type) #:environment environment #:entry-point #$(and entry-point |