diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-06-26 22:37:49 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-06-26 23:29:19 +0200 |
| commit | 00410bbeafc5e0247f8fb9a63b7919f8cbe6a655 (patch) | |
| tree | b331124ede6b4b4de1ef31c910f9a75f8fdcf459 | |
| parent | e6685186a5bbd5fecde4b4daa9d60eee35d2c783 (diff) | |
| download | guix-00410bbeafc5e0247f8fb9a63b7919f8cbe6a655.tar guix-00410bbeafc5e0247f8fb9a63b7919f8cbe6a655.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/cross-base.scm | 2 | ||||
| -rw-r--r-- | 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 9b4aa103da..b35a3cb40b 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 dd2d0f1b95..f0c4451e80 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 |