From b8cbc0dda4090f40083cc3a6e9d9a40d6f34e7bb Mon Sep 17 00:00:00 2001
From: Evgeny Pisemsky <mail@pisemsky.site>
Date: Fri, 22 Aug 2025 19:45:04 +0300
Subject: [PATCH] gnu: guile-mqtt: Use the latest nyacc.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/guile-xyz.scm (guile-mqtt): Use the latest nyacc.
[origin]: patch make file to properly compile ffi.
[arguments]: remove make flags (setenv in phases instead), disable parallel build.
[native-inputs]: replace nyacc-2.01 with nyacc.

Change-Id: I572164ed06d614b45ccd2d65603397ef7c0cd62d
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/guile-xyz.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index f3af71f232d..fd5f137dab0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1961,17 +1961,21 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1lvxic93cyzhdq7gb22pfz5j5pf7b1pcv0ahblkan8jbhzpqxvm0"))))
+        (base32 "1lvxic93cyzhdq7gb22pfz5j5pf7b1pcv0ahblkan8jbhzpqxvm0"))
+       ;; FIXME: report upstream and remove when fixed.
+       (modules '((guix build utils)))
+       (snippet '(substitute* "module/Makefile.am"
+                   (("compile-ffi -o mosquitto-nyacc.scm")
+                    "compile-ffi -X -o $(srcdir)/ffi/mosquitto-nyacc.scm")))))
     (build-system gnu-build-system)
     (arguments
      (list
-      #:make-flags
-      #~(list "GUILE_AUTO_COMPILE=0")
+      #:parallel-build? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'build 'patch-extension-path
             (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "HOME" "/tmp")
+              (setenv "GUILE_AUTO_COMPILE" "0")
               (with-directory-excursion "module"
                 (invoke "make" "ffi/mosquitto.scm")
                 (substitute* "ffi/mosquitto.scm"
@@ -1983,7 +1987,7 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.")
     (native-inputs (list autoconf
                          automake
                          guile-3.0
-                         nyacc-2.01
+                         nyacc
                          pkg-config
                          texinfo))
     (inputs (list mosquitto))