ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-dsv: Build with Guile 3.0.

Browse source 
* gnu/packages/guile-xyz.scm (guile-dsv)[inputs]: Replace guile-2.2 with
  guile-3.0.
  [propagated-inputs]: Replace guile2.2-lib with guile-lib.
  [arguments]: Add "configure support guile3.0" phase.
  (guile2.2-dsv): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jack Hill 2020-05-23 18:50:39 -04:00 committed by Ludovic Courtès
parent b7e1e556b2
commit f81ce752b3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/guile-xyz.scm
View file

@ -465,8 +465,8 @@ (define-public guile-dsv
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs `(("guile2.2-lib" ,guile2.2-lib)))
(inputs `(("guile" ,guile-3.0)))
(propagated-inputs `(("guile-lib" ,guile-lib)))
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
@ -474,6 +474,14 @@ (define-public guile-dsv
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:phases (modify-phases %standard-phases
;; Support Guile 3.0 in configure from upstream commit
;; 4c724577ccf19bb88580f72f2f6b166a0447ce3f
(add-before 'bootstrap 'configure-support-guile3.0
(lambda _
(substitute* "configure.ac"
(("GUILE_PKG.*")
"GUILE_PKG([3.0 2.0 2.2])"))
#t))
(add-before 'configure 'set-guilesitedir
(lambda _
(substitute* "Makefile.in"
@ -493,7 +501,7 @@ (define-public guile-dsv
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(guile-lib (assoc-ref inputs "guile2.2-lib"))
(guile-lib (assoc-ref inputs "guile-lib"))
(version (target-guile-effective-version))
(scm (string-append "/share/guile/site/"
version))
@ -515,6 +523,13 @@ (define-public guile-dsv
Unix-style DSV format and RFC 4180 format.")
(license license:gpl3+)))
(define-public guile2.2-dsv
(package
(inherit guile-dsv)
(name "guile2.2-dsv")
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
(define-public guile-fibers
(package
(name "guile-fibers")