diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:01:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-30 12:05:27 +0200 |
| commit | 79355ae3e84359716f5135cc7083e72246bc8bf9 (patch) | |
| tree | 6b61851e2153581578bb78ef0f177b8841ee5db7 /gnu/packages/man.scm | |
| parent | 39d6b9c99f297e14fc4f47f002be3d40556726be (diff) | |
| parent | 86d8f6d3efb8300a3354735cbf06be6c01e23243 (diff) | |
| download | guix-79355ae3e84359716f5135cc7083e72246bc8bf9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/man.scm')
| -rw-r--r-- | gnu/packages/man.scm | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 7d266cf91d..ddb7a3e283 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 David Thompson <dthompson2@worcester.edu> -;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -69,18 +69,23 @@ a flexible and convenient way.") (build-system gnu-build-system) (arguments '(#:phases - (alist-cons-after - 'patch-source-shebangs 'patch-test-shebangs - (lambda* (#:key outputs #:allow-other-keys) - ;; Patch shebangs in test scripts. - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (file) - (substitute* file - (("#! /bin/sh") - (string-append "#!" (which "sh"))))) - (remove file-is-directory? - (find-files "src/tests" ".*"))))) - %standard-phases) + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-test-shebangs + (lambda* (#:key outputs #:allow-other-keys) + ;; Patch shebangs in test scripts. + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) + (substitute* file + (("#! /bin/sh") + (string-append "#!" (which "sh"))))) + (remove file-is-directory? + (find-files "src/tests" ".*")))))) + (add-after 'unpack 'patch-iconv-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/man.c" + (("\"iconv\"") + (string-append "\"" (which "iconv") "\""))) + #t))) #:configure-flags (let ((groff (assoc-ref %build-inputs "groff")) (less (assoc-ref %build-inputs "less")) |