1 files changed, 23 insertions, 14 deletions

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e6aea6d67b6..b25061eb074 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1652,15 +1652,16 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.")
 (define-public guile-mqtt
   (package
     (name "guile-mqtt")
-    (version "0.2.1")
+    (version "1.0.0")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/mdjurfeldt/" name
-                           "/releases/download/v" version
-                           "/" name "-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mdjurfeldt/guile-mqtt")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "16a3r6yk41yskwv4qbkrsi0f5rvc7aw2s5di74i8y89j1x9yp9zs"))))
+        (base32 "1lvxic93cyzhdq7gb22pfz5j5pf7b1pcv0ahblkan8jbhzpqxvm0"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -1668,15 +1669,23 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.")
       #~(list "GUILE_AUTO_COMPILE=0")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-extension-path
+          (add-before 'build 'patch-extension-path
             (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "module/ffi/mosquitto.scm"
-                (("list #f \"libmosquitto\"")
-                 (string-append
-                  "list #f \""
-                  (search-input-file inputs "/lib/libmosquitto.so")
-                  "\""))))))))
-    (native-inputs (list guile-3.0 pkg-config))
+              (setenv "HOME" "/tmp")
+              (with-directory-excursion "module"
+                (invoke "make" "ffi/mosquitto.scm")
+                (substitute* "ffi/mosquitto.scm"
+                  (("list #f \"libmosquitto\"")
+                   (string-append
+                    "list #f \""
+                    (search-input-file inputs "/lib/libmosquitto.so")
+                    "\"")))))))))
+    (native-inputs (list autoconf
+                         automake
+                         guile-3.0
+                         nyacc-2.01
+                         pkg-config
+                         texinfo))
     (inputs (list mosquitto))
     (home-page "https://github.com/mdjurfeldt/guile-mqtt")
     (synopsis "Guile bindings for the libmosquitto library")