futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: lout: Revert changes from dc1d3cdef7.

Browse Source 
This caused `make` to error out like this:

ERROR: In procedure primitive-load-path:
ERROR: In procedure read_inner_expression: gnu/packages/lout.scm:31:12: unexpected ")"

* gnu/packages/lout.scm (lout)[arguments]: Don't use 'modify-phases'.
This commit is contained in:
Marius Bakke 2017-09-21 20:26:23 +02:00
parent dc1d3cdef7
commit dfe0bac420
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
gnu/packages/lout.scm
View File

@ -28,11 +28,53 @@
;; rules. Instead, it has a makefile that has to be patched to set the ;; rules. Instead, it has a makefile that has to be patched to set the
;; prefix, etc., and it has no makefile rules to build its doc. ;; prefix, etc., and it has no makefile rules to build its doc.
(let ((configure-phase (let ((configure-phase
') '(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(substitute* "makefile"
(("^PREFIX[[:blank:]]*=.*$")
(string-append "PREFIX = " out "\n"))
(("^LOUTLIBDIR[[:blank:]]*=.*$")
(string-append "LOUTLIBDIR = " out "/lib/lout\n"))
(("^LOUTDOCDIR[[:blank:]]*=.*$")
(string-append "LOUTDOCDIR = " doc "/share/doc/lout\n"))
(("^MANDIR[[:blank:]]*=.*$")
(string-append "MANDIR = " out "/man\n")))
(mkdir out)
(mkdir (string-append out "/bin"))
(mkdir (string-append out "/lib"))
(mkdir (string-append out "/man"))
(mkdir-p (string-append doc "/share/doc/lout")))))
(install-man-phase (install-man-phase
') '(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "make" "installman"))))
(doc-phase (doc-phase
')) '(lambda* (#:key outputs #:allow-other-keys)
(define out
(assoc-ref outputs "doc"))
(setenv "PATH"
(string-append (assoc-ref outputs "out")
"/bin:" (getenv "PATH")))
(chdir "doc")
(every (lambda (doc)
(format #t "doc: building `~a'...~%" doc)
(with-directory-excursion doc
(let ((file (string-append out "/share/doc/lout/"
doc ".ps")))
(and (or (file-exists? "outfile.ps")
(zero? (system* "lout" "-r4" "-o"
"outfile.ps" "all")))
(begin
(copy-file "outfile.ps" file)
#t)
(zero? (system* "ps2pdf"
"-dPDFSETTINGS=/prepress"
"-sPAPERSIZE=a4"
file
(string-append out "/share/doc/lout/"
doc ".pdf")))))))
'("design" "expert" "slides" "user")))))
(package (package
(name "lout") (name "lout")
(version "3.40") (version "3.40")
@ -47,64 +89,23 @@
(outputs '("out" "doc")) (outputs '("out" "doc"))
(native-inputs (native-inputs
`(("ghostscript" ,ghostscript))) `(("ghostscript" ,ghostscript)))
(arguments (arguments `(#:modules ((guix build utils)
`(#:modules ((guix build utils) (guix build gnu-build-system)
(guix build gnu-build-system) (srfi srfi-1)) ; we need SRFI-1
(srfi srfi-1)) ; we need SRFI-1 #:tests? #f ; no "check" target
#:tests? #f ; no "check" target
;; Customize the build phases. ;; Customize the build phases.
#:phases #:phases (alist-replace
(modify-phases %standard-phases 'configure ,configure-phase
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(substitute* "makefile"
(("^PREFIX[[:blank:]]*=.*$")
(string-append "PREFIX = " out "\n"))
(("^LOUTLIBDIR[[:blank:]]*=.*$")
(string-append "LOUTLIBDIR = " out "/lib/lout\n"))
(("^LOUTDOCDIR[[:blank:]]*=.*$")
(string-append "LOUTDOCDIR = " doc "/share/doc/lout\n"))
(("^MANDIR[[:blank:]]*=.*$")
(string-append "MANDIR = " out "/man\n")))
(mkdir out)
(mkdir (string-append out "/bin"))
(mkdir (string-append out "/lib"))
(mkdir (string-append out "/man"))
(mkdir-p (string-append doc "/share/doc/lout")))
#t))
(add-after 'install 'install-man-pages
(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "make" "installman"))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(define out
(assoc-ref outputs "doc"))
(setenv "PATH" (alist-cons-after
(string-append (assoc-ref outputs "out") 'install 'install-man-pages
"/bin:" (getenv "PATH"))) ,install-man-phase
(chdir "doc")
(every (lambda (doc) (alist-cons-after
(format #t "doc: building `~a'...~%" doc) 'install 'install-doc
(with-directory-excursion doc ,doc-phase
(let ((file (string-append out "/share/doc/lout/" %standard-phases)))))
doc ".ps")))
(and (or (file-exists? "outfile.ps")
(zero? (system* "lout" "-r4" "-o"
"outfile.ps" "all")))
(begin
(copy-file "outfile.ps" file)
#t)
(zero? (system* "ps2pdf"
"-dPDFSETTINGS=/prepress"
"-sPAPERSIZE=a4"
file
(string-append out "/share/doc/lout/"
doc ".pdf")))))))
'("design" "expert" "slides" "user")))))))
(synopsis "Document layout system") (synopsis "Document layout system")
(description (description
"The Lout document formatting system reads a high-level description of "The Lout document formatting system reads a high-level description of