summary refs log tree commit diff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-12-02 16:34:11 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-12-05 08:42:03 +0100
commitf8490817e70c78502ba7bcb9aa98164d0e72b66c (patch)
treec76695bb86118921ddd0ef03626244714fb74ac0
parent7e6ee16d498f48b7bb74fefe5d3d67c62b5baa9d (diff)
downloadguix-f8490817e70c78502ba7bcb9aa98164d0e72b66c.tar.gz
gnu: evolution: Build with libsoup 2.
* gnu/packages/gnome.scm (evolution) [phase adjust-webkitgtk-version]: Remove
it.
[inputs]: Depend on webkitgtk-with-libsoup2 instead of webkitgtk.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
-rw-r--r--gnu/packages/gnome.scm7
1 files changed, 1 insertions, 6 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3e607dc7df..f2b663a477 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11265,11 +11265,6 @@ generic enough to work for everyone.")
                                           ; in four years and cannot be built.
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'adjust-webkitgtk-version
-           (lambda _
-             (substitute* '("CMakeLists.txt" "evolution-shell.pc.in")
-               (("webkit2gtk-4.0")
-                "webkit2gtk-4.1"))))
          ;; The build system attempts to install user interface modules to the
          ;; output directory of the "evolution-data-server" package.  This
          ;; change redirects that change.
@@ -11303,7 +11298,7 @@ generic enough to work for everyone.")
        ("libsoup" ,libsoup)
        ("nss" ,nss)
        ("openldap" ,openldap)
-       ("webkitgtk" ,webkitgtk)
+       ("webkitgtk" ,webkitgtk-with-libsoup2) ; because of evolution-data-server
        ("ytnef" ,ytnef)))
     (home-page "https://gitlab.gnome.org/GNOME/evolution")
     (synopsis "Manage your email, contacts and schedule")