gnu: groff: Add 'bash' input for 'wrap-program'.

It is required for cross-compilation.

* gnu/packages/groff.scm (roffit): Remove trailing #t
[native-inputs]: Remove labels.
[inputs]: Add 'bash-minimal'.
(ronn-ng)[inputs]: Add 'bash-minimal'.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I6ffaf53d1389c49b96c964447989b9db45d6b509
This commit is contained in:
Maxime Devos 2021-07-02 12:13:07 +02:00 committed by Ludovic Courtès
parent aea7828669
commit 8a5fa92fd6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -34,6 +34,7 @@ (define-module (gnu packages groff)
#:use-module (guix build-system ruby) #:use-module (guix build-system ruby)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bash)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
@ -199,17 +200,15 @@ (define-public roffit
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(install-file "roffit" (string-append out "/bin")) (install-file "roffit" (string-append out "/bin"))
(install-file "roffit.1" (string-append out "/share/man/man1")) (install-file "roffit.1"
#t))) (string-append out "/share/man/man1")))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/roffit") (wrap-program (string-append out "/bin/roffit")
`("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))) `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
#t)))))) (native-inputs (list perl-html-tree)) ; for test
(native-inputs `(("html-tree" ,perl-html-tree))) ; for test (inputs (list bash-minimal perl))
(inputs
(list perl))
(home-page "https://daniel.haxx.se/projects/roffit/") (home-page "https://daniel.haxx.se/projects/roffit/")
(synopsis "Convert nroff files to HTML") (synopsis "Convert nroff files to HTML")
(description (description
@ -258,7 +257,7 @@ (define-public ronn-ng
"ruby-mustache" "ruby-mustache"
"ruby-nokogiri")))))))))) "ruby-nokogiri"))))))))))
(inputs (inputs
(list ruby-kramdown ruby-mustache ruby-nokogiri)) (list bash-minimal ruby-kramdown ruby-mustache ruby-nokogiri))
(synopsis (synopsis
"Build manuals in HTML and Unix man page format from Markdown") "Build manuals in HTML and Unix man page format from Markdown")
(description (description