01/02: gnu: Add guile3.0-ncurses.

[guix-commits]

mothacehe pushed a commit to branch master
in repository guix.

commit 3c566eba1951dbcdb162fb20e249bbaac87a4c4a
Author: Martin Becze <address@hidden>
AuthorDate: Thu Apr 30 11:21:38 2020 -0500

    gnu: Add guile3.0-ncurses.
    
    * gnu/packages/guile-xyz.scm (guile-ncurses)[arguments]:
    Use Guile effective version instead of hardcoding the version number in the
    libary path. Also import the required module to do that.
    (guile3.0-ncurses): New variable.
    
    Signed-off-by: Mathieu Othacehe <address@hidden>
---
 gnu/packages/guile-xyz.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 6ec1c4c..de76f3b 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2019 swedebugia <address@hidden>
 ;;; Copyright © 2019, 2020 Amar Singh <address@hidden>
 ;;; Copyright © 2019 Timothy Sample <address@hidden>
-;;; Copyright © 2019 Martin Becze <address@hidden>
+;;; Copyright © 2019, 2020 Martin Becze <address@hidden>
 ;;; Copyright © 2020 Evan Straw <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1833,7 +1833,13 @@ many readers as needed).")
               ("guile" ,guile-2.2)))
     (native-inputs `(("pkg-config" ,pkg-config)))
     (arguments
-     '(#:configure-flags (list "--with-ncursesw"  ; Unicode support
+     `(#:modules ((guix build gnu-build-system)
+                  ((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
+                  (guix build utils))
+       #:imported-modules ((guix build guile-build-system)
+                           ,@%gnu-build-system-modules)
+       #:configure-flags (list "--with-ncursesw" ; Unicode support
                                "--with-gnu-filesystem-hierarchy")
        #:phases
        (modify-phases %standard-phases
@@ -1848,8 +1854,8 @@ many readers as needed).")
                     (files (find-files dir ".scm")))
                (substitute* files
                  (("\"libguile-ncurses\"")
-                  (format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
-                          out)))
+                  (format #f "\"~a/lib/guile/~a/libguile-ncurses\""
+                          out (target-guile-effective-version))))
                #t))))))
     (home-page "https://www.gnu.org/software/guile-ncurses/";)
     (synopsis "Guile bindings to ncurses")
@@ -1858,6 +1864,14 @@ many readers as needed).")
 library.")
     (license license:lgpl3+)))
 
+(define-public guile3.0-ncurses
+  (package
+    (inherit guile-ncurses)
+    (name "guile3.0-ncurses")
+    (version "3.0")
+    (inputs `(("ncurses" ,ncurses)
+              ("guile" ,guile-3.0)))))
+
 (define-public guile-ncurses/gpm
   (package
     (inherit guile-ncurses)