[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: doxygen: Use sh from the store.
From: |
Leo Famulari |
Subject: |
05/06: gnu: doxygen: Use sh from the store. |
Date: |
Tue, 17 Jan 2017 08:59:08 +0000 (UTC) |
lfam pushed a commit to branch staging
in repository guix.
commit 603308ee601b9ca96e90822b61b4e150106db425
Author: Thomas Danckaert <address@hidden>
Date: Tue Jan 3 12:58:28 2017 +0100
gnu: doxygen: Use sh from the store.
* gnu/packages/documentation.scm (doxygen)[inputs]: Add bash-minimal.
[arguments]: Add phase to add store prefix to "/bin/sh".
Signed-off-by: Leo Famulari <address@hidden>
---
gnu/packages/documentation.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index bbc25e8..e0713c3 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2016 Andreas Enge <address@hidden>
;;; Copyright © 2016 Eric Bavier <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
+;;; Copyright © 2016 Thomas Danckaert <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages python)
#:use-module (gnu packages bison)
#:use-module (gnu packages docbook)
@@ -99,8 +101,18 @@ markup) can be customized and extended by the user.")
("flex" ,flex)
("libxml2" ,libxml2) ; provides xmllint for the tests
("python" ,python-2))) ; for creating the documentation
+ (inputs
+ `(("bash" ,bash-minimal)))
(arguments
- `(#:test-target "tests"))
+ `(#:test-target "tests"
+ #:phases (modify-phases %standard-phases
+ (add-before 'configure 'patch-sh
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/portable.cpp"
+ (("/bin/sh")
+ (string-append
+ (assoc-ref inputs "bash") "/bin/sh")))
+ #t)))))
(home-page "http://www.stack.nl/~dimitri/doxygen/")
(synopsis "Generate documentation from annotated sources")
(description "Doxygen is the de facto standard tool for generating
- branch staging updated (8c6b077 -> 351ab2c), Leo Famulari, 2017/01/17
- 04/06: gnu: libdrm: Update to 2.4.74., Leo Famulari, 2017/01/17
- 02/06: gnu: speex: Update to 1.2.0., Leo Famulari, 2017/01/17
- 06/06: Merge branch 'master' into staging, Leo Famulari, 2017/01/17
- 01/06: gnu: libsndfile: Update to 1.0.27., Leo Famulari, 2017/01/17
- 05/06: gnu: doxygen: Use sh from the store.,
Leo Famulari <=
- 03/06: gnu: flac: Update to 1.3.2., Leo Famulari, 2017/01/17