diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-08 18:45:39 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-08 18:45:39 -0400 |
| commit | aedc6e9fc952665e666f2febfc0b37235ad850ff (patch) | |
| tree | 00d236f54b01e534b97b674673ca1ccd9b3cd18d /gnu/packages/man.scm | |
| parent | 69d5909e032e2fba57814ea9db52389d384d9341 (diff) | |
| parent | f1f6f227264999bb362a95e6ec74badcb7de34db (diff) | |
| download | guix-aedc6e9fc952665e666f2febfc0b37235ad850ff.tar.gz guix-aedc6e9fc952665e666f2febfc0b37235ad850ff.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/man.scm')
| -rw-r--r-- | gnu/packages/man.scm | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 046b0e3f39..58e26d82ff 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -5,7 +5,6 @@ ;;; 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. ;;; @@ -82,19 +81,11 @@ a flexible and convenient way.") (remove file-is-directory? (find-files "src/tests" ".*"))) #t))) - (add-after 'unpack 'patch-absolute-paths + (add-after 'unpack 'patch-iconv-path (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")) |