From 6c896768d191f1fbc129b2c5b1d7bcd8a88aa93c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 30 Nov 2021 00:05:18 +0100 Subject: [PATCH 2/2] gnu: gnome-builder: Use libsoup 2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-builder) [phase 'patch-meson]: Don’t search for webkit2gtk-4.1. [inputs]: Replace devhelp with devhelp-with-libsoup2 and webkit with webkit-with-libsoup2. --- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ccb99ca8ec..5f99616571 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12486,10 +12486,7 @@ (define-public gnome-builder (substitute* "src/libide/meson.build" (("/usr/lib") (string-append (assoc-ref inputs "python-pygobject") - "/lib"))) - (substitute* "meson.build" - (("webkit2gtk-4.0") "webkit2gtk-4.1")) - #t)) + "/lib"))))) (add-after 'configure 'fix-ninja (lambda _ ;; #43296: meson(?) incorrectly assumes we want to link @@ -12505,7 +12502,7 @@ (define-public gnome-builder (inputs `(("cmark" ,cmark) ("clang" ,clang) - ("devhelp" ,devhelp) + ("devhelp" ,devhelp-with-libsoup2) ("glade" ,glade3) ("gspell" ,gspell) ("gtk+" ,gtk+) @@ -12521,7 +12518,7 @@ (define-public gnome-builder ("sysprof" ,sysprof) ("template-glib" ,template-glib) ("vte" ,vte) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-with-libsoup2))) (propagated-inputs `(("gtksourceview" ,gtksourceview))) ;needed for settings (native-inputs -- 2.34.0