guix-commits
[Top][All Lists]
Advanced

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

26/38: gnu: node: Return #t from all phases.


From: Tobias Geerinckx-Rice
Subject: 26/38: gnu: node: Return #t from all phases.
Date: Mon, 25 Jun 2018 22:24:25 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 5112238fd67106605d578f7f16e54b836c8cf732
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Jun 24 22:16:27 2018 +0200

    gnu: node: Return #t from all phases.
    
    * gnu/packages/node.scm (node)[arguments]: Substitute INVOKE for
    SYSTEM*.
---
 gnu/packages/node.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 1a79066..684afb2 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015, 2016 David Thompson <address@hidden>
 ;;; Copyright © 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2017 Mike Gerwitz <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,7 +65,7 @@
                               "deps/uv"
                               "deps/zlib"))
                   (substitute* "Makefile"
-                    ;; Remove references to bundled software
+                    ;; Remove references to bundled software.
                     (("deps/http_parser/http_parser.gyp") "")
                     (("deps/uv/include/\\*.h") "")
                     (("deps/uv/uv.gyp") "")
@@ -138,10 +139,10 @@
                ;; Node's configure script expects the CC environment variable 
to
                ;; be set.
                (setenv "CC" (string-append (assoc-ref inputs "gcc") 
"/bin/gcc"))
-               (zero? (apply system*
-                             (string-append (assoc-ref inputs "python")
-                                            "/bin/python")
-                             "configure" flags)))))
+               (apply invoke
+                      (string-append (assoc-ref inputs "python")
+                                     "/bin/python")
+                      "configure" flags))))
          (add-after 'patch-shebangs 'patch-npm-shebang
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((bindir (string-append (assoc-ref outputs "out")



reply via email to

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