guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: shadow: Use 'modify-phases'.


From: Leo Famulari
Subject: 01/02: gnu: shadow: Use 'modify-phases'.
Date: Sat, 11 Feb 2017 13:44:11 -0500 (EST)

lfam pushed a commit to branch master
in repository guix.

commit 52701a3d35b471daf504bd313403d3fd2c88fb2d
Author: ng0 <address@hidden>
Date:   Sat Feb 11 13:18:42 2017 -0500

    gnu: shadow: Use 'modify-phases'.
    
    * gnu/packages/admin.scm (shadow): Use 'modify-phases'.
---
 gnu/packages/admin.scm | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5dc1fff..ea8b483 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Peter Feigl <address@hidden>
 ;;; Copyright © 2016 John J. Foerch <address@hidden>
-;;; Coypright © 2016, 2017 ng0 <address@hidden>
+;;; Coypright © 2016, 2017 ng0 <address@hidden>
 ;;; Coypright © 2016 Tobias Geerinckx-Rice <address@hidden>
 ;;; Coypright © 2016 John Darrington <address@hidden>
 ;;;
@@ -283,27 +283,27 @@ client and server, a telnet client and server, and an rsh 
client and server.")
     (arguments
      '(;; Assume System V `setpgrp (void)', which is the default on GNU
        ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
-       #:configure-flags '("--with-libpam" "ac_cv_func_setpgrp_void=yes")
+       #:configure-flags
+       '("--with-libpam" "ac_cv_func_setpgrp_void=yes")
 
-       #:phases (alist-cons-before
-                 'build 'set-nscd-file-name
-                 (lambda* (#:key inputs #:allow-other-keys)
-                   ;; Use the right file name for nscd.
-                   (let ((libc (assoc-ref inputs "libc")))
-                     (substitute* "lib/nscd.c"
-                       (("/usr/sbin/nscd")
-                        (string-append libc "/sbin/nscd")))))
-                 (alist-cons-after
-                  'install 'remove-groups
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    ;; Remove `groups', which is already provided by Coreutils.
-                    (let* ((out (assoc-ref outputs "out"))
-                           (bin (string-append out "/bin"))
-                           (man (string-append out "/share/man")))
-                      (delete-file (string-append bin "/groups"))
-                      (for-each delete-file (find-files man "^groups\\."))
-                      #t))
-                  %standard-phases))))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'set-nscd-file-name
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Use the right file name for nscd.
+             (let ((libc (assoc-ref inputs "libc")))
+               (substitute* "lib/nscd.c"
+                 (("/usr/sbin/nscd")
+                  (string-append libc "/sbin/nscd"))))))
+         (add-after 'install 'remove-groups
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Remove `groups', which is already provided by Coreutils.
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (man (string-append out "/share/man")))
+               (delete-file (string-append bin "/groups"))
+               (for-each delete-file (find-files man "^groups\\."))
+               #t))))))
 
     (inputs (if (string-suffix? "-linux"
                                 (or (%current-target-system)



reply via email to

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