guix-commits
[Top][All Lists]
Advanced

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

04/06: gnu: guile-ics: Add "guile3.0-ics" variant.


From: guix-commits
Subject: 04/06: gnu: guile-ics: Add "guile3.0-ics" variant.
Date: Fri, 24 Jan 2020 18:16:26 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 6713589d6beca4bdc3b7acbeb4e8975ef3ceb7cf
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Jan 24 23:03:07 2020 +0100

    gnu: guile-ics: Add "guile3.0-ics" variant.
    
    * gnu/packages/guile-xyz.scm (guile-ics)[source]: Add 'modules' and 
'snippet'.
    (guile3.0-ics): New variable.
---
 gnu/packages/guile-xyz.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 029054b..835539a 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1493,7 +1493,15 @@ provides tight coupling to Guix.")
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))))
+                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure.ac"
+                    (("^GUILE_PKG.*")
+                     "GUILE_PKG([3.0 2.2 2.0])\n"))
+                  #t))))
     (build-system gnu-build-system)
     (native-inputs
      `(("autoconf" ,autoconf-wrapper)
@@ -1513,6 +1521,14 @@ pure Scheme.  The library can be used to read and write 
iCalendar data.
 The library is shipped with documentation in Info format and usage examples.")
     (license license:gpl3+)))
 
+(define-public guile3.0-ics
+  (package
+    (inherit guile-ics)
+    (name "guile3.0-ics")
+    (inputs `(("guile" ,guile-3.0)
+              ,@(alist-delete "guile" (package-inputs guile-ics))))
+    (propagated-inputs `(("guile-lib" ,guile3.0-lib)))))
+
 (define-public guile-wisp
   (package
     (name "guile-wisp")



reply via email to

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