31/44: gnu: guix: Cross-build fixup for wrap-program.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit dfb88de9ade9916cd47c595a91d380f381f881aa
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Wed Apr 8 09:43:51 2020 +0200

    gnu: guix: Cross-build fixup for wrap-program.
    
    This allows running:
    
        guix build hello
    
    * gnu/packages/package-management.scm (guix)[arguments]: When 
cross-compiling,
    add 'wrap-program:substitute-host-bash phase to fixup the shebang generated 
by
    wrap-program.
    [inputs]: When cross-compiling, include bash-minimal.
---
 gnu/packages/package-management.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 9021643..d77c0cb 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages bootstrap)          ;for 'bootstrap-guile-origin'
@@ -190,6 +191,14 @@ $(prefix)/etc/init.d\n")))
                                      (string-append "LANGUAGE= PATH="
                                                     self "/bin"
                                                     ":" (getenv "PATH"))))
+                                  #t)))
+                            ;; XXX Touching wrap-program rebuilds world
+                            (add-after 'wrap-program 
'wrap-program:substitute-host-bash
+                              (lambda* (#:key inputs outputs 
#:allow-other-keys)
+                                (let ((out (assoc-ref outputs "out"))
+                                      (bash (assoc-ref inputs "bash")))
+                                  (substitute* (string-append out "/bin/guix")
+                                    (("^#!.*/bash") (string-append "#! " bash 
"/bin/bash")))
                                   #t))))
                           '())
                     (add-before 'check 'copy-bootstrap-guile
@@ -355,6 +364,9 @@ $(prefix)/etc/init.d\n")))
                       (string=? (%current-system) "x86_64-linux"))
                  `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
                  '())
+           ,@(if (%current-target-system)
+                 `(("bash" ,bash-minimal))
+                 '())
 
            ;; Tests also rely on these bootstrap executables.
            ("bootstrap/bash" ,(bootstrap-executable "bash" target))