apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 62a83908eb0400e2551374d6dcfe8fe1ed6c19d0
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Sun Oct 31 02:33:50 2021 -0400
gnu: Add webkitgtk-with-libsoup2
* gnu/packages/webkit.scm (webkitgtk-with-libsoup2): New variable.
---
gnu/packages/webkit.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index f7558e6..5230129 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018 Pierre Neidhardt <[email protected]>
;;; Copyright © 2019 Marius Bakke <[email protected]>
+;;; Copyright © 2021 Maxim Cournoyer <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -27,6 +28,7 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
+ #:use-module (guix build utils)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
@@ -359,3 +361,15 @@ HTML/CSS applications to full-fledged web browsers.")
license:lgpl2.1+
license:bsd-2
license:bsd-3))))
+
+;;; Required by gnome-online-accounts; as webkitgtk 2.34 propagates libsoup 3,
+;;; which causes the build to fail.
+(define-public webkitgtk-with-libsoup2
+ (package/inherit webkitgtk
+ (name "webkitgtk-with-libsoup2")
+ (arguments (substitute-keyword-arguments (package-arguments webkitgtk)
+ ((#:configure-flags flags)
+ `(cons "-DUSE_SOUP2=ON" ,flags))))
+ (propagated-inputs
+ (alist-replace "libsoup" (list libsoup-minimal-2)
+ (package-propagated-inputs webkitgtk)))))
