Merge pull request #64627 from aske/virtman-fix
Fix virt-manager on non-gnome systems
This commit is contained in:
commit
7803ff314c
|
@ -1,13 +1,18 @@
|
|||
{ stdenv, fetchurl, python3Packages, intltool, file
|
||||
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
|
||||
, gobject-introspection, libvirt-glib, system-libvirt
|
||||
, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
|
||||
, gsettings-desktop-schemas, glib, libosinfo, gnome3
|
||||
, gtksourceview4
|
||||
, spiceSupport ? true, spice-gtk ? null
|
||||
, cpio, e2fsprogs, findutils, gzip
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
# TODO: remove after there's support for setupPyDistFlags
|
||||
let
|
||||
setuppy = ../../../development/interpreters/python/run_setup.py;
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "virt-manager-${version}";
|
||||
version = "2.2.0";
|
||||
|
@ -19,13 +24,14 @@ python3Packages.buildPythonApplication rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook intltool file
|
||||
intltool file
|
||||
gobject-introspection # for setup hook populating GI_TYPELIB_PATH
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
wrapGAppsHook
|
||||
libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
|
||||
gsettings-desktop-schemas libosinfo gtk3
|
||||
gsettings-desktop-schemas libosinfo gtksourceview4
|
||||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
] ++ optional spiceSupport spice-gtk;
|
||||
|
||||
|
@ -43,8 +49,12 @@ python3Packages.buildPythonApplication rec {
|
|||
${python3Packages.python.interpreter} setup.py configure --prefix=$out
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
|
||||
# TODO: remove after there's support for setupPyDistFlags
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cp ${setuppy} nix_run_setup
|
||||
${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
|
|
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
|||
xen
|
||||
] ++ optionals spiceSupport [
|
||||
spice-gtk spice-protocol libcap gdbm
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
# Required for USB redirection PolicyKit rules file
|
||||
|
|
|
@ -87,10 +87,13 @@ stdenv.mkDerivation rec {
|
|||
vala
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cyrus_sasl
|
||||
epoxy
|
||||
gst_all_1.gst-plugins-base
|
||||
gtk3
|
||||
json-glib
|
||||
libcacard
|
||||
|
|
Loading…
Reference in a new issue