15/16: HACK hurd-etc-service: add with-parameters *ugh*

[guix-commits]

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

commit 58204852f0a206b92c9e786986f217899e49a300
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun May 3 16:30:20 2020 +0200

    HACK hurd-etc-service: add with-parameters *ugh*
    
    This
         ./pre-inst-env guix system vm-image --target=i586-pc-gnu 
gnu/system/examples/bare-hurd.tmpl --keep-failed
    
    Attemptes to build the "hurd" for the build host (target #f), while 
expanding
    hurd-etc-service:
    
    ;;; ("hurd-etc-service target=" "i586-pc-gnu")
    
    ;;; ("hurd-etc-service target=" "i586-pc-gnu")
    
    ;;; ("hurd-etc-service target=" #f)
    
    ;;; ("hurd-etc-service target=" #f)
    The following derivation will be built:
       /gnu/store/9s621nadr6xcj74n1dl4c7gkvn8x0179-hurd-0.9-1.91a5167.drv
    building 
/gnu/store/9s621nadr6xcj74n1dl4c7gkvn8x0179-hurd-0.9-1.91a5167.drv...
    / 'configure' phasenote: keeping build directory 
`/tmp/guix-build-hurd-0.9-1.91a5167.drv-23'
    builder for 
`/gnu/store/9s621nadr6xcj74n1dl4c7gkvn8x0179-hurd-0.9-1.91a5167.drv' failed 
with exit code 1
    build of /gnu/store/9s621nadr6xcj74n1dl4c7gkvn8x0179-hurd-0.9-1.91a5167.drv 
failed
---
 gnu/services/hurd.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index b3c71e6..dc1bb0a 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -22,6 +22,7 @@
   #:use-module (gnu system)
   #:use-module (guix gexp)
   #:use-module (guix records)
+  #:use-module (guix utils)
   #:export (hurd-etc-service))
 
 ;;; Commentary:
@@ -38,7 +39,7 @@
 (define (hurd-etc-service os)
   "Return a <service> that builds containing the static part of the /etc
 directory."
-  (let ((profile (mixed-text-file "profile"  "\
+  (let* ((profile (mixed-text-file "profile"  "\
 # Generated by hurd-etc-services
 export PS1='\\u@\\h\\$ '
 
@@ -49,7 +50,12 @@ GUIX_PROFILE=\"$HOME/.guix-profile\"
 if [ -f \"$GUIX_PROFILE/etc/profile\" ]; then
   . \"$GUIX_PROFILE/etc/profile\"
 fi\n"))
-        (hurd (operating-system-hurd os)))
+         (target (pk "hurd-etc-services: target=" (%current-target-system)))
+         (hurd (operating-system-hurd os))
+         (hurd (if target
+                   (with-parameters ((%current-target-system target))
+                     hurd)
+                   hurd)))
     (etc-service
      `(("services" ,(file-append net-base "/etc/services"))
        ("protocols" ,(file-append net-base "/etc/protocols"))