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

commit 8fcdd9d53ffdbc77d6bd3af416e2a3c41615e43b
Author: Mark H Weaver <m...@netris.org>
Date:   Fri Mar 16 02:36:06 2018 -0400

    gnu: p7zip: Use invoke.
    
    * gnu/packages/compression.scm (p7zip)[arguments]: Use invoke and remove
    vestigial plumbing.
---
 gnu/packages/compression.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 32393a4..7bc7d61 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1420,22 +1420,22 @@ It can be used as a replacement for the Apache 
@code{CBZip2InputStream} /
        (modify-phases %standard-phases
          (replace 'configure
            (lambda* (#:key system outputs #:allow-other-keys)
-             (zero? (system* "cp"
-                             (let ((system ,(or (%current-target-system)
-                                                (%current-system))))
-                               (cond
-                                ((string-prefix? "x86_64" system)
-                                 "makefile.linux_amd64_asm")
-                                ((string-prefix? "i686" system)
-                                 "makefile.linux_x86_asm_gcc_4.X")
-                                (else
-                                 "makefile.linux_any_cpu_gcc_4.X")))
-                             "makefile.machine"))))
+             (invoke "cp"
+                     (let ((system ,(or (%current-target-system)
+                                        (%current-system))))
+                       (cond
+                        ((string-prefix? "x86_64" system)
+                         "makefile.linux_amd64_asm")
+                        ((string-prefix? "i686" system)
+                         "makefile.linux_x86_asm_gcc_4.X")
+                        (else
+                         "makefile.linux_any_cpu_gcc_4.X")))
+                     "makefile.machine")))
          (replace 'check
            (lambda _
-             (and (zero? (system* "make" "test"))
-                  (zero? (system* "make" "test_7z"))
-                  (zero? (system* "make" "test_7zr"))))))))
+             (invoke "make" "test")
+             (invoke "make" "test_7z")
+             (invoke "make" "test_7zr"))))))
     (inputs
      (let ((system (or (%current-target-system)
                        (%current-system))))

Reply via email to