From: Marius Bakke <mbakke@fastmail.com>
To: guix-devel@gnu.org
Cc: Marius Bakke <mbakke@fastmail.com>
Subject: [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax.
Date: Wed, 25 Jan 2017 18:19:34 +0100 [thread overview]
Message-ID: <20170125171938.27271-3-mbakke@fastmail.com> (raw)
In-Reply-To: <20170125171938.27271-1-mbakke@fastmail.com>
* gnu/packages/xorg.scm (xorg-server)[arguments]: Use 'modify-phases'.
---
gnu/packages/xorg.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index eefb24116..0bff1159d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5061,17 +5061,19 @@ over Xlib, including:
"--enable-kdrive"
"--enable-xephyr")
- #:phases (alist-cons-before
- 'configure 'pre-configure
- (lambda _
- (substitute* (find-files "." "\\.c$")
- (("/bin/sh") (which "sh")))
-
- ;; Don't try to 'mkdir /var'.
- (substitute* "hw/xfree86/Makefile.in"
- (("\\$\\(MKDIR_P\\).*logdir.*")
- "true\n")))
- %standard-phases)))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'pre-configure
+ (lambda _
+ (substitute* (find-files "." "\\.c$")
+ (("/bin/sh") (which "sh")))
+
+ ;; Don't try to 'mkdir /var'.
+ (substitute* "hw/xfree86/Makefile.in"
+ (("\\$\\(MKDIR_P\\).*logdir.*")
+ "true\n"))
+ #t)))))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg implementation of the X Window System")
(description
--
2.11.0
next prev parent reply other threads:[~2017-01-25 17:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 17:19 [PATCH core-updates 0/6] Wait up! Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 1/6] gnu: Add libxfont2 Marius Bakke
2017-01-25 17:19 ` Marius Bakke [this message]
2017-01-25 17:19 ` [PATCH core-updates 3/6] gnu: xorg-server: Update to 1.19.1 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 4/6] gnu: xf86-video-qxl: Change to libxfont2 ABI Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 5/6] gnu: xf86-video-intel: Update to 2.99.917-2-028c946 Marius Bakke
2017-01-25 17:19 ` [PATCH core-updates 6/6] utils: Add helper method to make files writable Marius Bakke
2017-01-26 9:50 ` Ludovic Courtès
2017-01-26 21:21 ` Marius Bakke
2017-01-25 19:05 ` [PATCH core-updates 0/6] Wait up! Leo Famulari
2017-01-26 16:27 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170125171938.27271-3-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).