guix-commits
[Top][All Lists]
Advanced

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

06/09: gnu: address@hidden: Use 'modify-phases' syntax.


From: Efraim Flashner
Subject: 06/09: gnu: address@hidden: Use 'modify-phases' syntax.
Date: Tue, 28 Mar 2017 03:17:39 -0400 (EDT)

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

commit 56486b3a40958490550e46c122c6ae2ebf608aa3
Author: Efraim Flashner <address@hidden>
Date:   Mon Mar 27 19:04:44 2017 +0300

    gnu: address@hidden: Use 'modify-phases' syntax.
    
    * gnu/packages/gnuzilla.scm (address@hidden)[arguments]: Use 'modify-phases'
    syntax.
---
 gnu/packages/gnuzilla.scm | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index be3e59a..3034ee9 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -85,31 +85,30 @@
     (inputs
      `(("zlib" ,zlib)))
     (arguments
-      `(;; XXX: parallel build fails, lacking:
-        ;;   mkdir -p "system_wrapper_js/"
-        #:parallel-build? #f
-        #:phases
-         (alist-cons-after 'unpack 'delete-timedout-test
+     `(;; XXX: parallel build fails, lacking:
+       ;;   mkdir -p "system_wrapper_js/"
+       #:parallel-build? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'delete-timedout-test
            ;; This test times out on slower hardware.
-           (lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js"))
-          (alist-cons-before
-           'configure 'chdir
+           (lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js")))
+         (add-before 'configure 'chdir
            (lambda _
-             (chdir "js/src"))
-           (alist-replace
-            'configure
-            ;; configure fails if it is followed by SHELL and CONFIG_SHELL
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (setenv "SHELL" (which "sh"))
-                (setenv "CONFIG_SHELL" (which "sh"))
-                (zero? (system*
-                        "./configure" (string-append "--prefix=" out)
-                                      ,@(if (string=? "aarch64-linux"
-                                                      (%current-system))
-                                          '("--host=aarch64-unknown-linux-gnu")
-                                          '())))))
-            %standard-phases)))))
+             (chdir "js/src")
+             #t))
+         (replace 'configure
+           ;; configure fails if it is followed by SHELL and CONFIG_SHELL
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (setenv "SHELL" (which "sh"))
+               (setenv "CONFIG_SHELL" (which "sh"))
+               (zero? (system*
+                       "./configure" (string-append "--prefix=" out)
+                                     ,@(if (string=? "aarch64-linux"
+                                                     (%current-system))
+                                         '("--host=aarch64-unknown-linux-gnu")
+                                         '())))))))))
     (home-page
      "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey";)
     (synopsis "Mozilla javascript engine")



reply via email to

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