From 375d5d03c91e722c1fcf17d456c303c53b0b5a80 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 16 Jun 2021 21:34:48 -0400 Subject: pack: Fix the system value passed to build-docker-image. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- guix/scripts/pack.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/scripts/pack.scm') 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 -- cgit v1.2.3