diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/webkit.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 083c8ccb08..74ffe92b84 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -260,6 +260,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ;; now, we explicitly disable it to prevent an error ;; at configuration time. "-DUSE_GSTREAMER_GL=OFF") + #:make-flags + ;; Never build with unsupported -j1: https://issues.guix.gnu.org/47964#5 + (list "-j" (number->string (max 2 (parallel-job-count)))) #:phases (modify-phases %standard-phases (add-after 'unpack 'configure-bubblewrap-store-directory |