nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mozjs: Return #t from all phases. 

* gnu/packages/gnuzilla.scm (mozjs)[arguments]: Return #t from the
'delete-timedout-test' phase.  Use 'invoke' in the configure phase.
This commit is contained in:
Mark H Weaver 2018-03-23 03:14:23 -04:00
parent feb0804376
commit e15793c8d0
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/gnuzilla.scm
View File

@ -98,7 +98,9 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'delete-timedout-test (add-after 'unpack 'delete-timedout-test
;; This test times out on slower hardware. ;; This test times out on slower hardware.
(lambda _ (delete-file "js/src/jit-test/tests/basic/bug698584.js"))) (lambda _
(delete-file "js/src/jit-test/tests/basic/bug698584.js")
#t))
(add-before 'configure 'chdir (add-before 'configure 'chdir
(lambda _ (lambda _
(chdir "js/src") (chdir "js/src")
@ -109,12 +111,11 @@
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(setenv "SHELL" (which "sh")) (setenv "SHELL" (which "sh"))
(setenv "CONFIG_SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh"))
(zero? (system* (invoke "./configure" (string-append "--prefix=" out)
"./configure" (string-append "--prefix=" out) ,@(if (string=? "aarch64-linux"
,@(if (string=? "aarch64-linux" (%current-system))
(%current-system)) '("--host=aarch64-unknown-linux-gnu")
'("--host=aarch64-unknown-linux-gnu") '()))))))))
'())))))))))
(home-page (home-page
"https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey") "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey")
(synopsis "Mozilla javascript engine") (synopsis "Mozilla javascript engine")