diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-16 01:33:04 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-16 05:02:28 -0400 |
| commit | 408fcff67878636d88df3bfab8c983b32692900e (patch) | |
| tree | dd357e389578233a296ed623e7f9aec5b4ed086b /gnu/packages/base.scm | |
| parent | 957a99ab971d4164286e7f0d6c851d6bf05f7598 (diff) | |
| download | guix-408fcff67878636d88df3bfab8c983b32692900e.tar.gz | |
gnu: tzdata: Use invoke instead of system*.
* gnu/packages/base.scm (tzdata)[arguments]: Use invoke. Return a boolean from all phase procedures.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index a6da2f7eca..f3001cb8bd 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1116,8 +1116,8 @@ command.") (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 @@ command.") (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) |