summary refs log tree commit diff
path: root/gnu/packages/gtk.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-23 11:26:08 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-23 11:26:56 +0100
commit2c9fd7636f1ec43c864516de4b1787df84572e9c (patch)
treea5160f6930850a1bc5461997df4581e11bdba70c /gnu/packages/gtk.scm
parent897186c1554e18a187429683d2eafdbfc0caac96 (diff)
downloadguix-2c9fd7636f1ec43c864516de4b1787df84572e9c.tar.gz
gnu: guile-present: Add "guile3.0-present".
* gnu/packages/gtk.scm (guile-present)[source](snippet): Add "3.0" to
the supported Guile versions.
(guile3.0-present): New variable.
Diffstat (limited to 'gnu/packages/gtk.scm')
-rw-r--r--gnu/packages/gtk.scm15
1 files changed, 15 insertions, 0 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 88c4b56e9d..f934eabe27 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -951,6 +951,11 @@ images onto Cairo surfaces.")
               (modules '((guix build utils)))
               (snippet
                '(begin
+                  ;; Allow builds with Guile 3.0.
+                  (substitute* "configure"
+                    (("2\\.2 2\\.0")
+                     "3.0 2.2 2.0"))
+
                   ;; Install .go files in the right place.
                   (substitute* "Makefile.in"
                     (("/ccache") "/site-ccache"))
@@ -991,6 +996,16 @@ includes a tools to generate PDF presentations out of Org mode and Texinfo
 documents.")
     (license license:lgpl3+)))
 
+(define-public guile3.0-present
+  (package
+    (inherit guile-present)
+    (name "guile3.0-present")
+    (inputs `(("guile" ,guile-3.0)))
+    (propagated-inputs
+     `(("guile-lib" ,guile3.0-lib)
+       ("guile-cairo" ,guile3.0-cairo)
+       ("guile-rsvg" ,guile3.0-rsvg)))))
+
 (define-public guile-gnome
    (package
     (name "guile-gnome")