aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-11 23:04:06 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-12 17:19:36 -0500
commit9c6a1d69333c89ad726fede844e1f391162ea218 (patch)
tree2f72205943de2a3d40c53d9cd5f84b1c0f07ea27 /gnu
parentd36cba20ef3157a8a5ae47e9282cb5da34eec3d8 (diff)
downloadguix-9c6a1d69333c89ad726fede844e1f391162ea218.tar.gz
guix-9c6a1d69333c89ad726fede844e1f391162ea218.zip
gnu: gnome-boxes: Fix build.
Due to webkitgtk being built with libsoup@3, the pkg-config file it produces corresponds to 'webkit2gtk-4.1' rather than 'webkit2gtk-4.0', which is the one gnome-boxes need. * gnu/packages/gnome.scm (gnome-boxes)[meson]: New argument. [native-inputs]{libsoup}: Use libsoup-minimal-2. {webkitgtk}: Use webkitgtk-with-libsoup2.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/gnome.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f903405401..2057bed14d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11621,15 +11621,16 @@ integrate seamlessly with the GNOME desktop.")
(base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"))))
(build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t
+ `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60
+ #:glib-or-gtk? #t
#:configure-flags (list "-Drdp=false"
(string-append "-Dc_link_args=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib/gnome-boxes"))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-compile-resources
- ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
- ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+ `(("glib:bin" ,glib "bin") ;for glib-compile-resources
+ ("gtk+:bin" ,gtk+ "bin") ;for gtk-update-icon-cache
+ ("desktop-file-utils" ,desktop-file-utils) ;for update-desktop-database
("itstool" ,itstool)
("intltool" ,intltool)
("vala" ,vala)
@@ -11645,7 +11646,7 @@ integrate seamlessly with the GNOME desktop.")
("libhandy" ,libhandy)
("libosinfo" ,libosinfo)
("libsecret" ,libsecret)
- ("libsoup" ,libsoup)
+ ("libsoup" ,libsoup-minimal-2)
("libusb" ,libusb)
("libvirt" ,libvirt)
("libvirt-glib" ,libvirt-glib)
@@ -11653,7 +11654,7 @@ integrate seamlessly with the GNOME desktop.")
("spice-gtk" ,spice-gtk)
("sparql-query" ,sparql-query)
("vte" ,vte)
- ("webkitgtk" ,webkitgtk)
+ ("webkitgtk" ,webkitgtk-with-libsoup2) ;for webkit2gtk-4.0
("tracker" ,tracker)
("libgudev" ,libgudev)))
(home-page "https://wiki.gnome.org/Apps/Boxes")