ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: fastcap: Fix build and use INVOKE.

Browse source 
* gnu/packages/engineering.scm (fastcap)[native-inputs]: Replace texlive-tiny
with a texlive-union including texlive-fonts-amsfonts.
[arguments]: Use INVOKE in build phases.
This commit is contained in:
Ricardo Wurmus 2019-01-28 20:30:20 +01:00
parent ad34338d1e
commit 5a23696a47
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/engineering.scm
View file

@ -420,7 +420,7 @@ (define-public fastcap
;; FIXME: with texlive-tiny citation references are rendered as question ;; FIXME: with texlive-tiny citation references are rendered as question
;; marks. During the build warnings like these are printed: ;; marks. During the build warnings like these are printed:
;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3. ;; LaTeX Warning: Citation `nabors91' on page 2 undefined on input line 3.
`(("texlive" ,texlive-tiny) `(("texlive" ,(texlive-union (list texlive-fonts-amsfonts)))
("ghostscript" ,ghostscript))) ("ghostscript" ,ghostscript)))
(arguments (arguments
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
@ -432,8 +432,7 @@ (define-public fastcap
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'build 'make-doc (add-after 'build 'make-doc
(lambda _ (lambda _
(zero? (system* "make" "CC=gcc" "RM=rm" "SHELL=sh" (invoke "make" "CC=gcc" "RM=rm" "SHELL=sh" "manual")))
"manual"))))
(add-before 'make-doc 'fix-doc (add-before 'make-doc 'fix-doc
(lambda _ (lambda _
(substitute* "doc/Makefile" (("/bin/rm") (which "rm"))) (substitute* "doc/Makefile" (("/bin/rm") (which "rm")))
@ -474,13 +473,13 @@ (define-public fastcap
(setenv "HOME" "/tmp") ; FIXME: for texlive font cache (setenv "HOME" "/tmp") ; FIXME: for texlive font cache
(with-directory-excursion "doc" (with-directory-excursion "doc"
(and (and
(every (lambda (file) (for-each (lambda (file)
(zero? (system* "dvips" file "-o"))) (invoke "dvips" file "-o"))
(find-files "." "\\.dvi")) (find-files "." "\\.dvi"))
(every (lambda (file) (for-each (lambda (file)
(zero? (system* "ps2pdf" file))) (invoke "ps2pdf" file))
'("mtt.ps" "ug.ps" "tcad.ps")) '("mtt.ps" "ug.ps" "tcad.ps"))
(zero? (system* "make" "clean")))))) (invoke "make" "clean")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))