From 01497dfe6c0a2ce69287d0fd0008747965a000df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Jun 2016 09:30:01 +0200 Subject: Merge branch 'master' into core-updates --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 46342ee247..b1ffbc8658 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -48,7 +48,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) - #:use-module (gnu packages yasm) + #:use-module (gnu packages assembly) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) -- cgit 1.4.1 From 2d02a7789af1e4ab147959d053a001f7c62147ea Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 2 Jul 2016 10:43:45 +0800 Subject: gnu: mozjs-24: Disable parallel build. * gnu/packages/gnuzilla.scm (mozjs-24)[arguments]: Add '#:parallel-build? #f'. --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b1ffbc8658..a18978282b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -116,7 +116,10 @@ in C/C++.") '(substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE"))))) (arguments - '(#:phases + '(;; XXX: parallel build fails, lacking: + ;; mkdir -p "system_wrapper_js/" + #:parallel-build? #f + #:phases (modify-phases %standard-phases (replace 'configure -- cgit 1.4.1 From d778fa5ff6f4a860919eaf13db3f84cfc68cbee8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Jul 2016 17:40:01 -0400 Subject: gnu: mozjs: Disable parallel build. * gnu/packages/gnuzilla.scm (mozjs)[arguments]: Add '#:parallel-build? #f'. --- gnu/packages/gnuzilla.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a18978282b..506ab98e91 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -76,7 +76,10 @@ `(("perl" ,perl) ("python" ,python-2))) (arguments - `(#:phases + `(;; XXX: parallel build fails, lacking: + ;; mkdir -p "system_wrapper_js/" + #:parallel-build? #f + #:phases (alist-cons-before 'configure 'chdir (lambda _ -- cgit 1.4.1