From 2c9fd7636f1ec43c864516de4b1787df84572e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Jan 2020 11:26:08 +0100 Subject: 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. --- gnu/packages/gtk.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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") -- cgit v1.2.3