guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: guile-mastodon: Build with Guile 3.0.


From: guix-commits
Subject: 03/04: gnu: guile-mastodon: Build with Guile 3.0.
Date: Mon, 22 Feb 2021 04:23:22 -0500 (EST)

mothacehe pushed a commit to branch master
in repository guix.

commit bbd26d60edaeafab032ffa70e09633a621eeed92
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Feb 22 09:30:52 2021 +0100

    gnu: guile-mastodon: Build with Guile 3.0.
    
    * gnu/packages/guile-xyz.scm (guile-mastodon)[source]: Modify configure.ac 
to
    add Guile 3.0 support.
    [native-inputs]: Add "emacs" and "texinfo".
    [inputs]: Use Guile 3.0 and Guile Json 4.0.
---
 gnu/packages/guile-xyz.scm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 8d9126d..cbec208 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1308,16 +1308,27 @@ Scheme by using Guileā€™s foreign function interface.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))))
+                "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure.ac"
+                    (("^PKG_CHECK.*") "")
+                    (("^GUILE_PKG.*")
+                     "GUILE_PKG([3.0 2.2])\n"))
+                  #t))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
+       ("emacs" ,emacs-minimal)
+       ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)))
     (inputs
-     `(("guile" ,guile-2.2)
+     `(("guile" ,guile-3.0)
        ("gnutls" ,gnutls)
-       ("guile-json" ,guile-json-1)))
+       ("guile-json" ,guile-json-4)))
     (home-page "https://framagit.org/prouby/guile-mastodon";)
     (synopsis "Guile Mastodon REST API module")
     (description "This package provides Guile modules to access the



reply via email to

[Prev in Thread] Current Thread [Next in Thread]