branch master updated: pack: Fix the system value passed to build-docker-image.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 375d5d0  pack: Fix the system value passed to build-docker-image.
375d5d0 is described below

commit 375d5d03c91e722c1fcf17d456c303c53b0b5a80
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jun 16 21:34:48 2021 -0400

    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>
---
 guix/scripts/pack.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index b653138..8cb4e6d 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