spice-gtk: port to libsoup 3

This commit is contained in:
Jan Tojnar 2022-08-15 20:21:50 +02:00
parent bb3d5b6718
commit beb1906cfc
4 changed files with 17 additions and 8 deletions

View file

@ -3,7 +3,7 @@
, freerdp, libssh, libgcrypt, gnutls, vte
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
# The themes here are soft dependencies; only icons are missing without them.
, gnome
@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
freerdp libssh libgcrypt gnutls
pcre2 libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsoup spice-protocol spice-gtk libepoxy at-spi2-core
libsoup spice-protocol
# https://gitlab.com/Remmina/Remmina/-/issues/2754
spice-gtk_libsoup2
libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
harfbuzz python3
] ++ optionals withLibsecret [ libsecret ]

View file

@ -19,7 +19,8 @@
, pkg-config
, python3
, shared-mime-info
, spice-gtk ? null
# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88
, spice-gtk_libsoup2 ? null
, spice-protocol ? null
, spiceSupport ? true
, vte
@ -29,7 +30,7 @@
assert spiceSupport -> (
gdbm != null
&& libcap != null
&& spice-gtk != null
&& spice-gtk_libsoup2 != null
&& spice-protocol != null
);
@ -78,12 +79,12 @@ stdenv.mkDerivation rec {
] ++ optionals spiceSupport [
gdbm
libcap
spice-gtk
spice-gtk_libsoup2
spice-protocol
];
# Required for USB redirection PolicyKit rules file
propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2;
strictDeps = true;

View file

@ -17,13 +17,16 @@
, libdrm
, libjpeg_turbo
, libopus
, withLibsoup2 ? false
, libsoup
, libsoup_3
, libusb1
, lz4
, meson
, ninja
, openssl
, perl
, phodav_2_0
, phodav
, pixman
, pkg-config
@ -84,7 +87,6 @@ stdenv.mkDerivation rec {
gettext
gobject-introspection
gtk-doc
libsoup
meson
ninja
perl
@ -108,10 +110,11 @@ stdenv.mkDerivation rec {
libcacard
libjpeg_turbo
libopus
(if withLibsoup2 then libsoup else libsoup_3)
libusb1
lz4
openssl
phodav
(if withLibsoup2 then phodav_2_0 else phodav)
pixman
spice-protocol
usbredir

View file

@ -22097,6 +22097,8 @@ with pkgs;
spice-gtk = callPackage ../development/libraries/spice-gtk { };
spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; };
spice-protocol = callPackage ../development/libraries/spice-protocol { };
spice-up = callPackage ../applications/office/spice-up { };