nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: tzdata: Use invoke instead of system*. 

* gnu/packages/base.scm (tzdata)[arguments]: Use invoke.  Return a boolean
from all phase procedures.
This commit is contained in:
Mark H Weaver 2018-03-16 01:33:04 -04:00
parent 957a99ab97
commit 408fcff678
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/base.scm
View File

@ -1116,8 +1116,8 @@ command.")
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'unpack (replace 'unpack
(lambda* (#:key source inputs #:allow-other-keys) (lambda* (#:key source inputs #:allow-other-keys)
(and (zero? (system* "tar" "xvf" source)) (invoke "tar" "xvf" source)
(zero? (system* "tar" "xvf" (assoc-ref inputs "tzcode")))))) (invoke "tar" "xvf" (assoc-ref inputs "tzcode"))))
(add-after 'install 'post-install (add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Move data in the right place. ;; Move data in the right place.
@ -1129,7 +1129,8 @@ command.")
(copy-recursively (string-append out "/share/zoneinfo-leaps") (copy-recursively (string-append out "/share/zoneinfo-leaps")
(string-append out "/share/zoneinfo/right")) (string-append out "/share/zoneinfo/right"))
(delete-file-recursively (delete-file-recursively
(string-append out "/share/zoneinfo-leaps"))))) (string-append out "/share/zoneinfo-leaps"))
#t)))
(delete 'configure)))) (delete 'configure))))
(inputs `(("tzcode" ,(origin (inputs `(("tzcode" ,(origin
(method url-fetch) (method url-fetch)