01/03: gnu: mig: Do not assume "perl" to be available.

[guix-commits]

janneke pushed a commit to branch master
in repository guix.

commit 00410bbeafc5e0247f8fb9a63b7919f8cbe6a655
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Jun 26 22:37:49 2020 +0200

    gnu: mig: Do not assume "perl" to be available.
    
    * gnu/packages/hurd.scm (mig)[inputs]: Include perl.
    [arguments]: Substitute "perl" with full store file name in bin/mig.
    * gnu/packages/cross-base.scm (cross-kernel-headers): Adjust mig-cross
    accordingly.
---
 gnu/packages/cross-base.scm |  2 +-
 gnu/packages/hurd.scm       | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 9b4aa10..b35a3cb 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -373,7 +373,7 @@ target that libc."
                                     ',%gcc-cross-include-paths)
                           #t))))
          #:configure-flags (list ,(string-append "--target=" target))
-         ,@(package-arguments mig)))
+         #:tests? #f))
 
       (propagated-inputs `(("cross-gnumach-headers" ,xgnumach-headers)))
       (native-inputs `(("cross-gcc" ,xgcc)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index dd2d0f1..f0c4451 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -131,11 +131,21 @@ GNU/Hurd."
     (build-system gnu-build-system)
     ;; Flex is needed both at build and run time.
     (inputs `(("gnumach-headers" ,gnumach-headers)
-              ("flex" ,flex)))
+              ("flex" ,flex)
+              ("perl" ,perl)))
     (native-inputs
      `(("flex" ,flex)
        ("bison" ,bison)))
-    (arguments `(#:tests? #f))
+    (arguments `(#:tests? #f
+                 #:phases
+                 (modify-phases %standard-phases
+                   (add-after 'install 'patch-non-shebang-references
+                     (lambda* (#:key build inputs outputs #:allow-other-keys)
+                       (let ((perl (assoc-ref inputs "perl"))
+                             (out  (assoc-ref outputs "out")))
+                         (substitute* (string-append out "/bin/mig")
+                           (("perl ") (string-append perl "/bin/perl ")))
+                         #t))))))
     (home-page 
"https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html";)
     (synopsis "Mach 3.0 interface generator for the Hurd")
     (description