mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 14:28:15 -05:00
gnu: guile-fibers: Add "guile3.0-fibers" variant.
* gnu/packages/guile-xyz.scm (guile-fibers)[source]: Add 'modules' and 'snippet'. (guile3.0-fibers): New variable.
This commit is contained in:
parent
9d6c6cb20e
commit
9e016129e1
1 changed files with 33 additions and 1 deletions
|
@ -496,7 +496,29 @@ (define-public guile-fibers
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))))
|
"0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0"))
|
||||||
|
(modules '((guix build utils)))
|
||||||
|
(snippet
|
||||||
|
'(begin
|
||||||
|
;; Allow builds with Guile 3.0.
|
||||||
|
(substitute* "configure"
|
||||||
|
(("search=\"2\\.2\"")
|
||||||
|
"search=\"3.0 2.2\""))
|
||||||
|
|
||||||
|
;; Explicitly include system headers rather than relying on
|
||||||
|
;; <libguile.h> to do it for us.
|
||||||
|
(substitute* "epoll.c"
|
||||||
|
(("#include.*libguile\\.h.*$" all)
|
||||||
|
(string-append "#include <unistd.h>\n"
|
||||||
|
"#include <string.h>\n"
|
||||||
|
all "\n")))
|
||||||
|
|
||||||
|
;; Import (ice-9 threads) for 'current-processor-count'.
|
||||||
|
(substitute* "tests/channels.scm"
|
||||||
|
(("#:use-module \\(fibers\\)")
|
||||||
|
(string-append "#:use-module (fibers)\n"
|
||||||
|
"#:use-module (ice-9 threads)\n")))
|
||||||
|
#t))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases (modify-phases %standard-phases
|
'(#:phases (modify-phases %standard-phases
|
||||||
|
@ -532,6 +554,16 @@ (define-public guile-fibers
|
||||||
(home-page "https://github.com/wingo/fibers")
|
(home-page "https://github.com/wingo/fibers")
|
||||||
(license license:lgpl3+)))
|
(license license:lgpl3+)))
|
||||||
|
|
||||||
|
(define-public guile3.0-fibers
|
||||||
|
(package
|
||||||
|
(inherit guile-fibers)
|
||||||
|
(name "guile3.0-fibers")
|
||||||
|
(arguments
|
||||||
|
;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0.
|
||||||
|
`(#:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations")
|
||||||
|
,@(package-arguments guile-fibers)))
|
||||||
|
(inputs `(("guile" ,guile-3.0)))))
|
||||||
|
|
||||||
(define-public guile-syntax-highlight
|
(define-public guile-syntax-highlight
|
||||||
(package
|
(package
|
||||||
(name "guile-syntax-highlight")
|
(name "guile-syntax-highlight")
|
||||||
|
|
Loading…
Reference in a new issue