[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: gnu: groff-minimal: Inherit phases from groff.
From: |
Marius Bakke |
Subject: |
08/08: gnu: groff-minimal: Inherit phases from groff. |
Date: |
Wed, 6 Dec 2017 11:33:04 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2ced84fbaee2f224cf2ef493ef6b0dc9839a1b13
Author: Marius Bakke <address@hidden>
Date: Wed Dec 6 17:25:23 2017 +0100
gnu: groff-minimal: Inherit phases from groff.
* gnu/packages/groff.scm (groff-minimal)[arguments]: Use
'substitute-keyword-arguments' to prevent phases from "groff" overriding the
phases in groff-minimal.
---
gnu/packages/groff.scm | 49 +++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index fd098cd..5f1b8d0 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -22,6 +22,7 @@
(define-module (gnu packages groff)
#:use-module (guix licenses)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
@@ -92,32 +93,32 @@ is usually the formatter of \"man\" documentation pages.")
#:configure-flags '("--docdir=/tmp/trash/doc")
- #:phases (modify-phases %standard-phases
- (add-after 'install 'remove-non-essential-programs
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Keep only the programs that man-db needs at run time,
- ;; and make sure we don't pull in Perl.
- (let ((out (assoc-ref outputs "out"))
- (kept '("eqn" "neqn" "pic" "tbl" "refer"
- "nroff" "groff" "troff" "grotty")))
- (for-each (lambda (file)
- (unless (member (basename file) kept)
- (delete-file file)))
- (find-files (string-append out "/bin")))
+ ,@(substitute-keyword-arguments (package-arguments groff)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'install 'remove-non-essential-programs
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Keep only the programs that man-db needs at run time,
+ ;; and make sure we don't pull in Perl.
+ (let ((out (assoc-ref outputs "out"))
+ (kept '("eqn" "neqn" "pic" "tbl" "refer"
+ "nroff" "groff" "troff" "grotty")))
+ (for-each (lambda (file)
+ (unless (member (basename file) kept)
+ (delete-file file)))
+ (find-files (string-append out "/bin")))
- ;; Remove a bunch of unneeded Perl scripts.
- (for-each delete-file (find-files out "\\.pl$"))
- (for-each delete-file
- (find-files out "BuildFoundries"))
+ ;; Remove a bunch of unneeded Perl scripts.
+ (for-each delete-file (find-files out "\\.pl$"))
+ (for-each delete-file
+ (find-files out "BuildFoundries"))
- ;; Remove ~3 MiB from share/groff/X.Y/font/devBACKEND
- ;; corresponding to the unused backends.
- (for-each delete-file-recursively
- (find-files out "^dev(dvi|ps|pdf|html|lj4)$"
- #:directories? #t))
- #t))))
-
- ,@(package-arguments groff)))))
+ ;; Remove ~3 MiB from share/groff/X.Y/font/devBACKEND
+ ;; corresponding to the unused backends.
+ (for-each delete-file-recursively
+ (find-files out "^dev(dvi|ps|pdf|html|lj4)$"
+ #:directories? #t))
+ #t))))))))))
;; There are no releases, so we take the latest commit.
(define-public roffit
- branch core-updates updated (e09bb8a -> 2ced84f), Marius Bakke, 2017/12/06
- 03/08: gnu: mesa: Update to 17.2.6., Marius Bakke, 2017/12/06
- 04/08: gnu: help2man: Update to 1.47.5., Marius Bakke, 2017/12/06
- 02/08: gnu: harfbuzz: Update to 1.7.2., Marius Bakke, 2017/12/06
- 06/08: gnu: at-spi2-core: Update to 2.26.2., Marius Bakke, 2017/12/06
- 08/08: gnu: groff-minimal: Inherit phases from groff.,
Marius Bakke <=
- 01/08: gnu: glibc-locales: Don't inherit 'move-static-libs' phase from glibc., Marius Bakke, 2017/12/06
- 07/08: gnu: at-spi2-atk: Update to 2.26.1., Marius Bakke, 2017/12/06
- 05/08: gnu: atk: Update to 2.26.1., Marius Bakke, 2017/12/06