Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
730 changed files with 3907 additions and 1907 deletions
@@ -1,7 +1,7 @@
{ lib, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobject-introspection, libvirt-glib, system-libvirt
, gsettings-desktop-schemas, libosinfo, gnome3
, gsettings-desktop-schemas, libosinfo, gnome
, gtksourceview4, docutils
, spiceSupport ? true, spice-gtk ? null
, cpio, e2fsprogs, findutils, gzip
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
wrapGAppsHook
libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi
gsettings-desktop-schemas libosinfo gtksourceview4
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
] ++ optional spiceSupport spice-gtk;