public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64627 from aske/virtman-fix

Browse Source 
Fix virt-manager on non-gnome systems
This commit is contained in:
Jaka Hudoklin 2019-07-13 08:00:46 +02:00 committed by GitHub
commit 7803ff314c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -1,13 +1,18 @@
{ stdenv, fetchurl, python3Packages, intltool, file { stdenv, fetchurl, python3Packages, intltool, file
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf , wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobject-introspection, libvirt-glib, system-libvirt , 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 , spiceSupport ? true, spice-gtk ? null
, cpio, e2fsprogs, findutils, gzip , cpio, e2fsprogs, findutils, gzip
}: }:
with stdenv.lib; with stdenv.lib;
# TODO: remove after there's support for setupPyDistFlags
let
setuppy = ../../../development/interpreters/python/run_setup.py;
in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "virt-manager-${version}"; name = "virt-manager-${version}";
version = "2.2.0"; version = "2.2.0";
@ -19,13 +24,14 @@ python3Packages.buildPythonApplication rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
wrapGAppsHook intltool file intltool file
gobject-introspection # for setup hook populating GI_TYPELIB_PATH gobject-introspection # for setup hook populating GI_TYPELIB_PATH
]; ];
buildInputs = [ buildInputs = [
wrapGAppsHook
libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi 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 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
] ++ optional spiceSupport spice-gtk; ] ++ optional spiceSupport spice-gtk;
@ -43,8 +49,12 @@ python3Packages.buildPythonApplication rec {
${python3Packages.python.interpreter} setup.py configure --prefix=$out ${python3Packages.python.interpreter} setup.py configure --prefix=$out
''; '';
postInstall = '' # TODO: remove after there's support for setupPyDistFlags
${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas 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 = '' preFixup = ''

1
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
xen xen
] ++ optionals spiceSupport [ ] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm 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 # Required for USB redirection PolicyKit rules file

5
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -87,10 +87,13 @@ stdenv.mkDerivation rec {
vala vala
]; ];
propagatedBuildInputs = [
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
];
buildInputs = [ buildInputs = [
cyrus_sasl cyrus_sasl
epoxy epoxy
gst_all_1.gst-plugins-base
gtk3 gtk3
json-glib json-glib
libcacard libcacard