me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnome-builder: Use libsoup 2. 

* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
Vivien Kraus 2021-11-30 00:05:18 +01:00 committed by Mathieu Othacehe
parent 89907521ef
commit 762643e0fc
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/gnome.scm
View File

@ -12486,10 +12486,7 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(substitute* "src/libide/meson.build" (substitute* "src/libide/meson.build"
(("/usr/lib") (("/usr/lib")
(string-append (assoc-ref inputs "python-pygobject") (string-append (assoc-ref inputs "python-pygobject")
"/lib"))) "/lib")))))
(substitute* "meson.build"
(("webkit2gtk-4.0") "webkit2gtk-4.1"))
#t))
(add-after 'configure 'fix-ninja (add-after 'configure 'fix-ninja
(lambda _ (lambda _
;; #43296: meson(?) incorrectly assumes we want to link ;; #43296: meson(?) incorrectly assumes we want to link
@ -12505,7 +12502,7 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(inputs (inputs
`(("cmark" ,cmark) `(("cmark" ,cmark)
("clang" ,clang) ("clang" ,clang)
("devhelp" ,devhelp) ("devhelp" ,devhelp-with-libsoup2)
("glade" ,glade3) ("glade" ,glade3)
("gspell" ,gspell) ("gspell" ,gspell)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
@ -12521,7 +12518,7 @@ libraries. Applications do not need to be recompiled--or even restarted.")
("sysprof" ,sysprof) ("sysprof" ,sysprof)
("template-glib" ,template-glib) ("template-glib" ,template-glib)
("vte" ,vte) ("vte" ,vte)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk-with-libsoup2)))
(propagated-inputs (propagated-inputs
`(("gtksourceview" ,gtksourceview))) ;needed for settings `(("gtksourceview" ,gtksourceview))) ;needed for settings
(native-inputs (native-inputs