diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-05-06 15:56:24 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-05-06 15:56:24 +0200 |
| commit | 12bd588346f8b2fb3709acfe0ee89d153da2db34 (patch) | |
| tree | 459d8eb13a0508170ba462fe61a8b45fb55ea79f /gnu/packages/man.scm | |
| parent | 7d5adf013127c89826e9fbe9f1a67265b3538609 (diff) | |
| parent | 8e020519b45bbdb9403164bd4403f2465bac99ad (diff) | |
| download | gnu-guix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar gnu-guix-12bd588346f8b2fb3709acfe0ee89d153da2db34.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/man.scm')
| -rw-r--r-- | gnu/packages/man.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 3455a9c126..046b0e3f39 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,11 +82,19 @@ a flexible and convenient way.") (remove file-is-directory? (find-files "src/tests" ".*"))) #t))) - (add-after 'unpack 'patch-iconv-path + (add-after 'unpack 'patch-absolute-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/man.c" (("\"iconv\"") (string-append "\"" (which "iconv") "\""))) + ;; Embed an absolute reference to "preconv", otherwise it + ;; falls back to searching in PATH and ultimately fails + ;; to render unicode data (see <https://bugs.gnu.org/30785>). + (substitute* "lib/encodings.c" + (("groff_preconv = NULL") + (string-append "groff_preconv = \"" + (assoc-ref inputs "groff-minimal") + "/bin/preconv\""))) #t))) #:configure-flags (let ((groff (assoc-ref %build-inputs "groff")) @@ -151,7 +160,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "4.15") + (version "4.16") (source (origin (method url-fetch) (uri @@ -164,7 +173,7 @@ the traditional flat-text whatis databases.") "man-pages-" version ".tar.xz"))) (sha256 (base32 - "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f")))) + "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) |