From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/3] gnu: lvm2: Use 'modify-phases'. Date: Mon, 3 Oct 2016 15:42:44 -0400 Message-ID: References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br98z-0007i4-R1 for guix-devel@gnu.org; Mon, 03 Oct 2016 15:43:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1br98v-0007ro-L1 for guix-devel@gnu.org; Mon, 03 Oct 2016 15:43:20 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br98t-0007hG-9e for guix-devel@gnu.org; Mon, 03 Oct 2016 15:43:17 -0400 Received: from localhost.localdomain (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 66F5BF2D2D for ; Mon, 3 Oct 2016 15:43:04 -0400 (EDT) In-Reply-To: In-Reply-To: References: 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 * gnu/packages/linux.scm (lvm2)[arguments]: Use 'modify-phases'. --- gnu/packages/linux.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 693558f..28a2e81 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1657,16 +1657,17 @@ time.") (inputs `(("udev" ,eudev))) (arguments - '(#:phases (alist-cons-after - 'configure 'set-makefile-shell - (lambda _ - ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as - ;; expected. - (setenv "SHELL" (which "sh")) + '(#:phases + (modify-phases %standard-phases + (add-after 'configure 'set-makefile-shell + (lambda _ + ;; Use 'sh', not 'bash', so that '. lib/utils.sh' works as + ;; expected. + (setenv "SHELL" (which "sh")) - ;; Replace /bin/sh with the right file name. - (patch-makefile-SHELL "make.tmpl")) - %standard-phases) + ;; Replace /bin/sh with the right file name. + (patch-makefile-SHELL "make.tmpl") + #t))) #:configure-flags (list (string-append "--sysconfdir=" (assoc-ref %outputs "out") -- 2.10.0