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>
This commit is contained in:
parent
8c98eb2808
commit
3c566eba19
|
@ -23,7 +23,7 @@
|
||||||
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
|
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
|
||||||
;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
|
;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
|
||||||
;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
|
;;; 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>
|
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
@ -1833,7 +1833,13 @@ (define-public guile-ncurses
|
||||||
("guile" ,guile-2.2)))
|
("guile" ,guile-2.2)))
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)))
|
(native-inputs `(("pkg-config" ,pkg-config)))
|
||||||
(arguments
|
(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")
|
"--with-gnu-filesystem-hierarchy")
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
|
@ -1848,8 +1854,8 @@ (define-public guile-ncurses
|
||||||
(files (find-files dir ".scm")))
|
(files (find-files dir ".scm")))
|
||||||
(substitute* files
|
(substitute* files
|
||||||
(("\"libguile-ncurses\"")
|
(("\"libguile-ncurses\"")
|
||||||
(format #f "\"~a/lib/guile/2.2/libguile-ncurses\""
|
(format #f "\"~a/lib/guile/~a/libguile-ncurses\""
|
||||||
out)))
|
out (target-guile-effective-version))))
|
||||||
#t))))))
|
#t))))))
|
||||||
(home-page "https://www.gnu.org/software/guile-ncurses/")
|
(home-page "https://www.gnu.org/software/guile-ncurses/")
|
||||||
(synopsis "Guile bindings to ncurses")
|
(synopsis "Guile bindings to ncurses")
|
||||||
|
@ -1858,6 +1864,14 @@ (define-public guile-ncurses
|
||||||
library.")
|
library.")
|
||||||
(license license:lgpl3+)))
|
(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
|
(define-public guile-ncurses/gpm
|
||||||
(package
|
(package
|
||||||
(inherit guile-ncurses)
|
(inherit guile-ncurses)
|
||||||
|
|
Loading…
Reference in a new issue