[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: man-db: Pass --with-col to configure.
From: |
Alex Kost |
Subject: |
01/04: gnu: man-db: Pass --with-col to configure. |
Date: |
Tue, 21 Jul 2015 17:45:56 +0000 |
alezost pushed a commit to branch master
in repository guix.
commit d2eb275a6e990396d064f2d2ab6e7137e5808845
Author: Alex Kost <address@hidden>
Date: Tue Jul 21 17:04:10 2015 +0300
gnu: man-db: Pass --with-col to configure.
* gnu/packages/man.scm (man-db)[inputs]: Add 'util-linux'.
[arguments]: Add '--with-col' to configure flags.
---
gnu/packages/man.scm | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index 3173fac..8ebe4ac 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2012, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 David Thompson <address@hidden>
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015 Alex Kost <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -30,7 +31,8 @@
#:use-module (gnu packages less)
#:use-module (gnu packages lynx)
#:use-module (gnu packages perl)
- #:use-module (gnu packages pkg-config))
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages linux))
(define-public libpipeline
(package
@@ -82,14 +84,16 @@ a flexible and convenient way.")
(let ((groff (assoc-ref %build-inputs "groff"))
(less (assoc-ref %build-inputs "less"))
(gzip (assoc-ref %build-inputs "gzip"))
- (bzip2 (assoc-ref %build-inputs "bzip2"))
- (xz (assoc-ref %build-inputs "xz")))
+ (bzip2 (assoc-ref %build-inputs "bzip2"))
+ (xz (assoc-ref %build-inputs "xz"))
+ (util (assoc-ref %build-inputs "util-linux")))
;; Invoke groff, less, gzip, bzip2, and xz directly from the store.
(append (list "--disable-setuid" ;; Disable setuid man user.
(string-append "--with-pager=" less "/bin/less")
(string-append "--with-gzip=" gzip "/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"))
(map (lambda (prog)
(string-append "--with-" prog "=" groff "/bin/" prog))
'("nroff" "eqn" "neqn" "tbl" "refer" "pic"))))
@@ -103,7 +107,8 @@ a flexible and convenient way.")
("gdbm" ,gdbm)
("groff" ,groff)
("less" ,less)
- ("libpipeline" ,libpipeline)))
+ ("libpipeline" ,libpipeline)
+ ("util-linux" ,util-linux)))
(native-search-paths
(list (search-path-specification
(variable "MANPATH")