[bug#55179] [WIP PATCH 04/30] gnu: moarvm: Update to 2022.04.

[Paul A. Patience]

* gnu/packages/perl6.scm (moarvm): Update to 2022.04.
[arguments]: Add 'fix-build' phase.
[propagated-inputs]: Use latest libtommath. Move below native-inputs.
---
 gnu/packages/perl6.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm
index 052d4e0914..35652cda17 100644
--- a/gnu/packages/perl6.scm
+++ b/gnu/packages/perl6.scm
@@ -34,15 +34,14 @@ (define-module (gnu packages perl6)
 (define-public moarvm
   (package
     (name "moarvm")
-    (version "2019.03")
+    (version "2022.04")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://moarvm.org/releases/MoarVM-";
                            version ".tar.gz"))
        (sha256
-        (base32
-         "017w1zvr6yl0cgjfc1b3ddlc6vjw9q8p7alw1vvsckw95190xc14"))
+        (base32 "0128fxqaz7cwjf6amaz2cgd7xl52zvi5fr7bwnj229snll5za1mf"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -57,6 +56,10 @@ (define-public moarvm
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-build
+           (lambda _
+             (substitute* "build/Makefile.in"
+               (("^ +3rdparty/freebsd/.*") ""))))
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
@@ -71,11 +74,11 @@ (define-public moarvm
                        "--has-libffi"
                        "--has-libuv")))))))
     (home-page "https://moarvm.org/";)
-    ;; These should be inputs but moar.h can't find them when building rakudo
-    (propagated-inputs
-     (list libatomic-ops libffi libtommath-1.0 libuv))
     (native-inputs
      (list pkg-config))
+    ;; These should be inputs but moar.h can't find them when building Rakudo.
+    (propagated-inputs
+     (list libatomic-ops libffi libtommath libuv))
     (synopsis "VM for NQP And Rakudo Perl 6")
     (description
      "Short for \"Metamodel On A Runtime\", MoarVM is a modern virtual machine
--
2.36.0