diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-01-25 23:33:54 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-01-25 23:33:54 +0100 |
| commit | 46854e99caadcaaa282be1093e3ea6454667cac3 (patch) | |
| tree | 541db463b3e5ce518d7ad5956d47da516c69308c | |
| parent | 412bee5e2931a53066ae593808935608d54a4345 (diff) | |
| download | patches-46854e99caadcaaa282be1093e3ea6454667cac3.tar patches-46854e99caadcaaa282be1093e3ea6454667cac3.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/qt.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/webkit.scm | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8f148c9e90..dccc9a2e48 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -182,7 +182,12 @@ X11 (yet).") ("ruby" ,ruby) ("which" ,(@ (gnu packages base) which)))) (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 'configure (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index dd05446603..f902433786 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -149,6 +149,11 @@ HTML/CSS applications to full-fledged web browsers.") (build-system gnu-build-system) (arguments '(#: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 (add-after 'unpack 'set-gcc @@ -163,7 +168,12 @@ HTML/CSS applications to full-fledged web browsers.") (package (inherit webkitgtk-2.4) (name "webkitgtk-gtk2") (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" "--with-gtk=2.0") ,@(package-arguments webkitgtk-2.4))) |