~ruther/guix-local: gnu: evolution: Build with libsoup 2.

f8490817e70c78502ba7bcb9aa98164d0e72b66c — Vivien Kraus 4 years ago 7e6ee16

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>

patch browse .tar.gz .zip

1 files changed, 1 insertions(+), 6 deletions(-)

M gnu/packages/gnome.scm

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -6

@@ 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")