guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: tzdata: Use modify-phases


From: John Darrington
Subject: 02/02: gnu: tzdata: Use modify-phases
Date: Fri, 7 Oct 2016 05:00:25 +0000 (UTC)

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

commit c8f354588e5875976566c36c5550b35a47eb1698
Author: John Darrington <address@hidden>
Date:   Thu Oct 6 20:14:03 2016 +0200

    gnu: tzdata: Use modify-phases
    
    * gnu/packages/base.scm (tzdata)[arguments]: Replace alist- procedures
    with modify-phases
---
 gnu/packages/base.scm |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 8f12907..5aea2ce 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -950,23 +950,24 @@ command.")
                   (guix build gnu-build-system)
                   (srfi srfi-1))
        #:phases
-       (alist-replace
-        'unpack
-        (lambda* (#:key source inputs #:allow-other-keys)
-          (and (zero? (system* "tar" "xvf" source))
-               (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))
-        (alist-cons-after
-         'install 'post-install
-         (lambda* (#:key outputs #:allow-other-keys)
-           ;; Move data in the right place.
-           (let ((out (assoc-ref outputs "out")))
-             (symlink (string-append out "/share/zoneinfo")
-                      (string-append out "/share/zoneinfo/posix"))
-             (delete-file-recursively (string-append out 
"/share/zoneinfo-posix"))
-             (copy-recursively (string-append out "/share/zoneinfo-leaps")
-                               (string-append out "/share/zoneinfo/right"))
-             (delete-file-recursively (string-append out 
"/share/zoneinfo-leaps"))))
-         (alist-delete 'configure %standard-phases)))))
+       (modify-phases %standard-phases
+         (replace 'unpack
+           (lambda* (#:key source inputs #:allow-other-keys)
+             (and (zero? (system* "tar" "xvf" source))
+                  (zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode"))))))
+         (add-after 'install 'post-install
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Move data in the right place.
+             (let ((out (assoc-ref outputs "out")))
+               (symlink (string-append out "/share/zoneinfo")
+                        (string-append out "/share/zoneinfo/posix"))
+               (delete-file-recursively
+                (string-append out "/share/zoneinfo-posix"))
+               (copy-recursively (string-append out "/share/zoneinfo-leaps")
+                                 (string-append out "/share/zoneinfo/right"))
+               (delete-file-recursively
+                (string-append out "/share/zoneinfo-leaps")))))
+         (delete 'configure))))
     (inputs `(("tzcode" ,(origin
                           (method url-fetch)
                           (uri (string-append



reply via email to

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