diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2019-07-13 08:00:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-13 08:00:46 +0200 |
commit | 7803ff314c707ee11a6d8d1c9ac4cde70737d22e (patch) | |
tree | 720baabbf754ab1be2afefcd17eb814294270d97 /pkgs | |
parent | f93c5deb47ae7da3e04abb121dfb162a82f4551c (diff) | |
parent | 2df33c40ffa446cc0dd00c45dc7c71f8f6cf41c8 (diff) | |
download | nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar.gz nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar.bz2 nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar.lz nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar.xz nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.tar.zst nixlib-7803ff314c707ee11a6d8d1c9ac4cde70737d22e.zip |
Merge pull request #64627 from aske/virtman-fix
Fix virt-manager on non-gnome systems
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 5 |
3 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 392517e3ab26..2a76cf487b03 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -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 = '' diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 7c90f9b3483f..9c307d8e9ba4 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -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 diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 079d61ca3d58..8f92e0b64f6a 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -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 |