me/guix
Archived
1
0
Fork 0
Code Activity

gnu: man-db: Use G-expressions.

Browse source 
* gnu/packages/man.scm (man-db)[arguments]:
Rewrite as G-expressions.
This commit is contained in:
Tobias Geerinckx-Rice 2022-01-08 02:29:50 +01:00
parent 7e91d5d58c
commit bb2c7e2e13
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 65 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
gnu/packages/man.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
@ -27,6 +27,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages man) (define-module (gnu packages man)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download) #:use-module (guix download)
@ -134,70 +135,71 @@ a flexible and convenient way.")
"0mk7n7yn6scy785jhg1j14b3q9l0cgvpry49r0ldjsnizbnrjv5n")))) "0mk7n7yn6scy785jhg1j14b3q9l0cgvpry49r0ldjsnizbnrjv5n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'patch-source-shebangs 'patch-test-shebangs (add-after 'patch-source-shebangs 'patch-test-shebangs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Patch shebangs in test scripts. ;; Patch shebangs in test scripts.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(("#! /bin/sh") (("#! /bin/sh")
(string-append "#!" (which "sh"))))) (string-append "#!" (which "sh")))))
(remove file-is-directory? (remove file-is-directory?
(find-files "src/tests" ".*"))) (find-files "src/tests" ".*")))
#t))) #t)))
(add-after 'unpack 'patch-absolute-paths (add-after 'unpack 'patch-absolute-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/man.c" (substitute* "src/man.c"
(("\"iconv\"") (("\"iconv\"")
(string-append "\"" (which "iconv") "\""))) (string-append "\"" (which "iconv") "\"")))
;; Embed an absolute reference to "preconv", otherwise it ;; Embed an absolute reference to "preconv", otherwise it
;; falls back to searching in PATH and ultimately fails ;; falls back to searching in PATH and ultimately fails
;; to render unicode data (see <https://bugs.gnu.org/30785>). ;; to render unicode data (see <https://bugs.gnu.org/30785>).
(substitute* "lib/encodings.c" (substitute* "lib/encodings.c"
(("groff_preconv = NULL") (("groff_preconv = NULL")
(string-append "groff_preconv = \"" (string-append "groff_preconv = \""
(assoc-ref inputs "groff-minimal") (assoc-ref inputs "groff-minimal")
"/bin/preconv\""))) "/bin/preconv\"")))
#t))) #t)))
#:configure-flags #:configure-flags
(let ((groff (assoc-ref %build-inputs "groff")) #~(let ((groff (assoc-ref %build-inputs "groff"))
(groff-minimal (assoc-ref %build-inputs "groff-minimal")) (groff-minimal (assoc-ref %build-inputs "groff-minimal"))
(less (assoc-ref %build-inputs "less")) (less (assoc-ref %build-inputs "less"))
(gzip (assoc-ref %build-inputs "gzip")) (gzip (assoc-ref %build-inputs "gzip"))
(bzip2 (assoc-ref %build-inputs "bzip2")) (bzip2 (assoc-ref %build-inputs "bzip2"))
(xz (assoc-ref %build-inputs "xz")) (xz (assoc-ref %build-inputs "xz"))
(util (assoc-ref %build-inputs "util-linux"))) (util (assoc-ref %build-inputs "util-linux")))
;; Invoke groff, less, gzip, bzip2, and xz directly from the store. ;; Invoke groff, less, gzip, bzip2, & xz directly from the store.
(append (list ;; Disable setuid man user. (append (list ;; Disable setuid man user.
"--disable-setuid" "--disable-setuid"
;; Don't constrain ownership of system-wide cache files. ;; Don't constrain ownership of system-wide cache files.
;; Otherwise creating the manpage database fails with ;; Otherwise creating the manpage database fails with
;; man-db > 2.7.5. ;; man-db > 2.7.5.
"--disable-cache-owner" "--disable-cache-owner"
(string-append "--with-pager=" less "/bin/less") (string-append "--with-pager=" less "/bin/less")
(string-append "--with-gzip=" gzip "/bin/gzip") (string-append "--with-gzip=" gzip "/bin/gzip")
(string-append "--with-bzip2=" bzip2 "/bin/gzip") (string-append "--with-bzip2=" bzip2 "/bin/gzip")
(string-append "--with-xz=" xz "/bin/xz") (string-append "--with-xz=" xz "/bin/xz")
(string-append "--with-col=" util "/bin/col") (string-append "--with-col=" util "/bin/col")
;; The default systemd directories ignore --prefix. ;; The default systemd directories ignore --prefix.
(string-append "--with-systemdsystemunitdir=" (string-append "--with-systemdsystemunitdir="
%output "/lib/systemd/system") %output "/lib/systemd/system")
(string-append "--with-systemdtmpfilesdir=" (string-append "--with-systemdtmpfilesdir="
%output "/lib/tmpfiles.d")) %output "/lib/tmpfiles.d"))
(map (lambda (prog) (map (lambda (prog)
(string-append "--with-" prog "=" groff-minimal (string-append "--with-" prog "=" groff-minimal
"/bin/" prog)) "/bin/" prog))
'("nroff" "eqn" "neqn" "tbl" "refer" "pic")))) '("nroff" "eqn" "neqn" "tbl" "refer" "pic"))))
;; At run time we should refer to GROFF-MINIMAL, not GROFF (the latter ;; At run time we should refer to GROFF-MINIMAL, not GROFF (the latter
;; pulls in Perl.) ;; pulls in Perl.)
#:disallowed-references (,groff) #:disallowed-references
(list groff)
#:modules ((guix build gnu-build-system) #:modules '((guix build gnu-build-system)
(guix build utils) (guix build utils)
(srfi srfi-1)))) (srfi srfi-1))))
(native-inputs (native-inputs
(list pkg-config flex groff)) ;needed at build time (troff, grops, soelim, etc.) (list pkg-config flex groff)) ;needed at build time (troff, grops, soelim, etc.)
(inputs (inputs