[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: gnu: util-macros: Update phase style.
From: |
Tobias Geerinckx-Rice |
Subject: |
01/14: gnu: util-macros: Update phase style. |
Date: |
Tue, 20 Feb 2018 10:06:34 -0500 (EST) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 0dc618067ba54a7090126381fdcf5befb097a863
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Feb 20 04:05:09 2018 +0100
gnu: util-macros: Update phase style.
* gnu/packages/xorg.scm (util-macros)[arguments]: Use MODIFY-PHASES
syntax and end phases with #t.
---
gnu/packages/xorg.scm | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f5af15e..025d810 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1863,21 +1863,22 @@ management to participate in an X11R6 session.")
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments
- `(#:phases (alist-cons-after
- 'unpack 'fix-makefile-in
- (lambda _
- (substitute* "Makefile.in"
- ;; Install xorg-macros.pc in PREFIX/lib/pkgconfig,
- ;; not PREFIX/share/pkgconfig.
- (("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig")))
- (alist-cons-after
- 'install 'post-install-cleanup
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (with-directory-excursion out
- (delete-file "share/util-macros/INSTALL")
- (rmdir "share/util-macros"))))
- %standard-phases))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-makefile-in
+ (lambda _
+ (substitute* "Makefile.in"
+ ;; Install xorg-macros.pc in PREFIX/lib/pkgconfig,
+ ;; not PREFIX/share/pkgconfig.
+ (("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig"))
+ #t))
+ (add-after 'install 'post-install-cleanup
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-directory-excursion out
+ (delete-file "share/util-macros/INSTALL")
+ (rmdir "share/util-macros"))
+ #t))))))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg autoconf macros")
(description
- 10/14: gnu: intltool: Update phase style., (continued)
- 10/14: gnu: intltool: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 02/14: gnu: gts: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 06/14: gnu: glibc-hurd-headers: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 04/14: gnu: commencement: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 07/14: gnu: dblatex: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 05/14: gnu: address@hidden: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 03/14: gnu: address@hidden: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 09/14: gnu: make-bootstrap: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 12/14: gnu: cross-base: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 13/14: gnu: patchelf: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 01/14: gnu: util-macros: Update phase style.,
Tobias Geerinckx-Rice <=
- 11/14: gnu: indent: Update phase style., Tobias Geerinckx-Rice, 2018/02/20
- 08/14: gnu: libffi: Update phase style., Tobias Geerinckx-Rice, 2018/02/20