guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/11: gnu: xorg-server: Use 'modify-phases' syntax.


From: Marius Bakke
Subject: 06/11: gnu: xorg-server: Use 'modify-phases' syntax.
Date: Tue, 21 Feb 2017 08:58:53 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 10cd39d1e03e267d0c47a80e7edf9f98a5ce8b5b
Author: Marius Bakke <address@hidden>
Date:   Wed Jan 25 14:26:04 2017 +0100

    gnu: xorg-server: Use 'modify-phases' syntax.
    
    * 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 4c4af32..ede07fa 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5066,17 +5066,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]