From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: [PATCH core-updates 2/6] gnu: xorg-server: Use 'modify-phases' syntax. Date: Wed, 25 Jan 2017 18:19:34 +0100 Message-ID: <20170125171938.27271-3-mbakke@fastmail.com> References: <20170125171938.27271-1-mbakke@fastmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cWREa-0002pr-2C for guix-devel@gnu.org; Wed, 25 Jan 2017 12:19:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cWREY-0006XJ-Uo for guix-devel@gnu.org; Wed, 25 Jan 2017 12:19:48 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50383) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cWREY-0006X3-Qm for guix-devel@gnu.org; Wed, 25 Jan 2017 12:19:46 -0500 In-Reply-To: <20170125171938.27271-1-mbakke@fastmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: Marius Bakke * 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