nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: lout: Revert changes from dc1d3cdef7. 

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

75
gnu/packages/lout.scm
View File

@ -28,36 +28,7 @@
;; 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)
(install-man-phase
')
(doc-phase
'))
(package
(name "lout")
(version "3.40")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/lout/lout-"
version ".tar.gz"))
(sha256
(base32
"1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"))))
(build-system gnu-build-system) ; actually, just a makefile
(outputs '("out" "doc"))
(native-inputs
`(("ghostscript" ,ghostscript)))
(arguments
`(#:modules ((guix build utils)
(guix build gnu-build-system)
(srfi srfi-1)) ; we need SRFI-1
#:tests? #f ; no "check" target
;; Customize the build phases.
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
(substitute* "makefile" (substitute* "makefile"
@ -73,13 +44,12 @@
(mkdir (string-append out "/bin")) (mkdir (string-append out "/bin"))
(mkdir (string-append out "/lib")) (mkdir (string-append out "/lib"))
(mkdir (string-append out "/man")) (mkdir (string-append out "/man"))
(mkdir-p (string-append doc "/share/doc/lout"))) (mkdir-p (string-append doc "/share/doc/lout")))))
#t)) (install-man-phase
(add-after 'install 'install-man-pages '(lambda* (#:key outputs #:allow-other-keys)
(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "make" "installman")))) (zero? (system* "make" "installman"))))
(add-after 'install 'install-doc (doc-phase
(lambda* (#:key outputs #:allow-other-keys) '(lambda* (#:key outputs #:allow-other-keys)
(define out (define out
(assoc-ref outputs "doc")) (assoc-ref outputs "doc"))
@ -104,7 +74,38 @@
file file
(string-append out "/share/doc/lout/" (string-append out "/share/doc/lout/"
doc ".pdf"))))))) doc ".pdf")))))))
'("design" "expert" "slides" "user"))))))) '("design" "expert" "slides" "user")))))
(package
(name "lout")
(version "3.40")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/lout/lout-"
version ".tar.gz"))
(sha256
(base32
"1gb8vb1wl7ikn269dd1c7ihqhkyrwk19jwx5kd0rdvbk6g7g25ix"))))
(build-system gnu-build-system) ; actually, just a makefile
(outputs '("out" "doc"))
(native-inputs
`(("ghostscript" ,ghostscript)))
(arguments `(#:modules ((guix build utils)
(guix build gnu-build-system)
(srfi srfi-1)) ; we need SRFI-1
#:tests? #f ; no "check" target
;; Customize the build phases.
#:phases (alist-replace
'configure ,configure-phase
(alist-cons-after
'install 'install-man-pages
,install-man-phase
(alist-cons-after
'install 'install-doc
,doc-phase
%standard-phases)))))
(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