diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-11 00:56:39 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-11 00:59:31 -0400 |
| commit | 47ed8e048bd5905f7648bed472a13eb95393767d (patch) | |
| tree | b7482be04328d13f50932d51f7196479b08ce7fd | |
| parent | 8ba24e62af6a3a7a8e1fc600dd9256581c411c5d (diff) | |
| download | guix-47ed8e048bd5905f7648bed472a13eb95393767d.tar guix-47ed8e048bd5905f7648bed472a13eb95393767d.tar.gz | |
gnu: texinfo: Add procps to native-inputs to fix tests.
* gnu/packages/texinfo.scm (texinfo)[native-inputs]: Add procps.
(texinfo-5, texinfo-4)[native-inputs]: Override to be empty.
* gnu/packages/commencement.scm (texinfo-boot0)[texinfo]: Override
native-inputs to be empty.
| -rw-r--r-- | gnu/packages/commencement.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/texinfo.scm | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 02a9a3632c..d3f239f5f7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -284,6 +284,7 @@ ;; because we don't need the stand-alone Info reader. ;; Also, use %BOOT0-INPUTS to avoid building Perl once more. (let ((texinfo (package (inherit texinfo) + (native-inputs '()) (inputs (alist-delete "ncurses" (package-inputs texinfo)))))) (package-with-bootstrap-guile (package-with-explicit-inputs texinfo %boot0-inputs diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index cf367c11ef..92bd9471dd 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -26,6 +26,7 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages perl) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses)) (define-public texinfo @@ -40,6 +41,7 @@ (base32 "1r3i6jyynn6ab45fxw5bms8mflk9ry4qpj6gqyry72vfd5c47fhi")))) (build-system gnu-build-system) + (native-inputs `(("procps" ,procps))) ;one of the tests needs pgrep (inputs `(("ncurses" ,ncurses) ("xz" ,xz) ("perl" ,perl))) @@ -63,7 +65,8 @@ is on expressing the content semantically, avoiding physical markup commands.") version ".tar.xz")) (sha256 (base32 - "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))))) + "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) + (native-inputs '()))) (define-public texinfo-4 (package (inherit texinfo) @@ -77,6 +80,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (sha256 (base32 "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) + (native-inputs '()) (inputs `(("ncurses" ,ncurses) ("xz" ,xz))))) (define-public texi2html |