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

gnu: webkitgtk-2.4, webkitgtk/gtk+-2, qt: Disable parallel builds. 

* gnu/packages/webkit.scm (webkitgtk-2.4, webkitgtk/gtk+-2):
  Disable parallel builds as suggested in
  https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html .
* gnu/packages/qt.scm (qt): Likewise.
This commit is contained in:
Andreas Enge 2016-01-25 23:33:54 +01:00
parent 412bee5e29
commit 46854e99ca
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/qt.scm
View File

@ -182,7 +182,12 @@ X11 (yet).")
("ruby" ,ruby) ("ruby" ,ruby)
("which" ,(@ (gnu packages base) which)))) ("which" ,(@ (gnu packages base) which))))
(arguments (arguments
`(#:phases `(;; FIXME: Disabling parallel building is a quick hack to avoid the
;; failure described in
;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
;; A more structural fix is needed.
#:parallel-build? #f
#:phases
(alist-replace (alist-replace
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

12
gnu/packages/webkit.scm
View File

@ -149,6 +149,11 @@ HTML/CSS applications to full-fledged web browsers.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
;; FIXME: Disabling parallel building is a quick hack to avoid the
;; failure described in
;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
;; A more structural fix is needed.
#:parallel-build? #f
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after (add-after
'unpack 'set-gcc 'unpack 'set-gcc
@ -163,7 +168,12 @@ HTML/CSS applications to full-fledged web browsers.")
(package (inherit webkitgtk-2.4) (package (inherit webkitgtk-2.4)
(name "webkitgtk-gtk2") (name "webkitgtk-gtk2")
(arguments (arguments
`(#:configure-flags `(;; FIXME: Disabling parallel building is a quick hack to avoid the
;; failure described in
;; https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00837.html
;; A more structural fix is needed.
#:parallel-build? #f
#:configure-flags
'("--enable-webkit2=no" '("--enable-webkit2=no"
"--with-gtk=2.0") "--with-gtk=2.0")
,@(package-arguments webkitgtk-2.4))) ,@(package-arguments webkitgtk-2.4)))