[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: guile-charting: Add "guile3.0-charting" variant.
|
From: |
guix-commits |
|
Subject: |
03/05: gnu: guile-charting: Add "guile3.0-charting" variant. |
|
Date: |
Mon, 27 Jan 2020 17:19:59 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 2d3a622d04de7b7f58192dc868b846ec416f95bf
Author: Ludovic Courtès <address@hidden>
AuthorDate: Mon Jan 27 23:01:59 2020 +0100
gnu: guile-charting: Add "guile3.0-charting" variant.
* gnu/packages/plotutils.scm (guile-charting)[source]: In 'snippet',
have 'configure' look for 3.0.
(guile3.0-charting): New variable.
---
gnu/packages/plotutils.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 237baa9..ac8a6f4 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
@@ -99,6 +99,11 @@ scientific data.")
(modules '((guix build utils)))
(snippet
'(begin
+ ;; Allow builds with Guile 3.0.
+ (substitute* "configure"
+ (("2\\.2 2\\.0")
+ "3.0 2.2 2.0"))
+
;; By default, .go files would be installed to
;; $libdir/…/ccache instead of $libdir/…/site-ccache. Fix
;; that.
@@ -116,6 +121,13 @@ scientific data.")
using the Cairo drawing library.")
(license license:lgpl2.1+)))
+(define-public guile3.0-charting
+ (package
+ (inherit guile-charting)
+ (name "guile3.0-charting")
+ (inputs `(("guile" ,guile-3.0)))
+ (propagated-inputs `(("guile-cairo" ,guile3.0-cairo)))))
+
(define-public ploticus
(package
(name "ploticus")