diff options
| author | Martin Becze <mjbecze@riseup.net> | 2020-04-30 11:21:38 -0500 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2020-05-02 12:30:51 +0200 |
| commit | 3c566eba1951dbcdb162fb20e249bbaac87a4c4a (patch) | |
| tree | c769608e2d2ca8912cdcfcfff7ef562e5bb0c552 | |
| parent | 8c98eb28084858d89bdf6a3bd90eb056bf31c49e (diff) | |
| download | guix-3c566eba1951dbcdb162fb20e249bbaac87a4c4a.tar.gz | |
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 <m.othacehe@gmail.com>
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6ec1c4c2fc..de76f3b6d0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> ;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org> ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com> -;;; Copyright © 2019 Martin Becze <mjbecze@riseup.net> +;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com> ;;; ;;; 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) |