mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
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:
parent
957a99ab97
commit
408fcff678
1 changed files with 4 additions and 3 deletions
|
@ -1116,8 +1116,8 @@ (define-public tzdata
|
|||
(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"))))))
|
||||
(invoke "tar" "xvf" source)
|
||||
(invoke "tar" "xvf" (assoc-ref inputs "tzcode"))))
|
||||
(add-after 'install 'post-install
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
;; Move data in the right place.
|
||||
|
@ -1129,7 +1129,8 @@ (define-public tzdata
|
|||
(copy-recursively (string-append out "/share/zoneinfo-leaps")
|
||||
(string-append out "/share/zoneinfo/right"))
|
||||
(delete-file-recursively
|
||||
(string-append out "/share/zoneinfo-leaps")))))
|
||||
(string-append out "/share/zoneinfo-leaps"))
|
||||
#t)))
|
||||
(delete 'configure))))
|
||||
(inputs `(("tzcode" ,(origin
|
||||
(method url-fetch)
|
||||
|
|
Loading…
Reference in a new issue