diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/webkit.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 083c8ccb08..dab8af2ab8 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -226,14 +226,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.32.0") + (version "2.32.4") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx")) + "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) @@ -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 |