me
/
guix
Archived
1
0
Fork 0
Code

gnu: util-macros: Update phase style. 

* gnu/packages/xorg.scm (util-macros)[arguments]: Use MODIFY-PHASES
syntax and end phases with #t.
master
Tobias Geerinckx-Rice 2018-02-20 04:05:09 +01:00
parent cb4a178b20
commit 0dc618067b
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/xorg.scm
View File

@ -1863,21 +1863,22 @@ management to participate in an X11R6 session.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases (alist-cons-after `(#:phases
'unpack 'fix-makefile-in (modify-phases %standard-phases
(add-after 'unpack 'fix-makefile-in
(lambda _ (lambda _
(substitute* "Makefile.in" (substitute* "Makefile.in"
;; Install xorg-macros.pc in PREFIX/lib/pkgconfig, ;; Install xorg-macros.pc in PREFIX/lib/pkgconfig,
;; not PREFIX/share/pkgconfig. ;; not PREFIX/share/pkgconfig.
(("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig"))) (("\\$\\(datadir\\)/pkgconfig") "$(libdir)/pkgconfig"))
(alist-cons-after #t))
'install 'post-install-cleanup (add-after 'install 'post-install-cleanup
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(with-directory-excursion out (with-directory-excursion out
(delete-file "share/util-macros/INSTALL") (delete-file "share/util-macros/INSTALL")
(rmdir "share/util-macros")))) (rmdir "share/util-macros"))
%standard-phases)))) #t))))))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Xorg autoconf macros") (synopsis "Xorg autoconf macros")
(description (description