diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:37:28 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:55:08 +0000 |
| commit | 7df09ee0ab3e7962ef27859ce87e06a323059284 (patch) | |
| tree | d81334f742ddcb9a1ee63961ca6410922980af1c /gnu/packages/texinfo.scm | |
| parent | 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 (diff) | |
| parent | af95f2d8f98eb2c8c64954bb2fd0b70838899174 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/cmake.scm
gnu/packages/gnuzilla.scm
gnu/packages/haskell.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/samba.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/wxwidgets.scm
Diffstat (limited to 'gnu/packages/texinfo.scm')
| -rw-r--r-- | gnu/packages/texinfo.scm | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 9200083eab..bd0b22176e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2013, 2015-2017, 2019, 2022-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2019, 2022 Efraim Flashner <efraim@flashner.co.il> @@ -43,6 +43,7 @@ #:use-module ((gnu packages hurd) #:select (hurd-target?)) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-compression) #:use-module (gnu packages readline)) (define-public texinfo @@ -111,7 +112,27 @@ is on expressing the content semantically, avoiding physical markup commands.") version ".tar.xz")) (sha256 (base32 - "1balvbkdlwa8zwnzp4irkixq1zhps2wr6njmwj4ilgiqc4rfq4gj")))))) + "1balvbkdlwa8zwnzp4irkixq1zhps2wr6njmwj4ilgiqc4rfq4gj")))) + (inputs (modify-inputs (package-inputs texinfo) + (append perl-archive-zip))) ;needed for 'tex2any --epub3' + (arguments + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (program (string-append bin "/texi2any")) + (zip (car (find-files + (assoc-ref inputs "perl-archive-zip") + (lambda (file stat) + (and (eq? 'directory (stat:type stat)) + (string=? (basename file) + "Archive"))) + #:directories? #t)))) + (wrap-program program + `("PERL5LIB" prefix (,(dirname zip))))))))))))) (define-public texinfo-5 (package (inherit texinfo) |