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

virt-manager: Fixup path to libvirt's cpu_map.xml

Browse Source
This commit is contained in:
Shea Levy 2015-10-15 16:46:14 -04:00
parent 07372d04a2
commit 556151911e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
, wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte , wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3 , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
}: }:
with stdenv.lib; with stdenv.lib;
@ -22,7 +22,7 @@ buildPythonPackage rec {
paste_deploy m2crypto ipy twisted sqlalchemy_migrate paste_deploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2 distutils_extra simplejson readline glance cheetah lockfile httplib2
urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
libvirt libxml2Python ipaddr vte libosinfo libxml2Python ipaddr vte libosinfo
] ++ optional spiceSupport spice_gtk; ] ++ optional spiceSupport spice_gtk;
buildInputs = buildInputs =
@ -40,6 +40,10 @@ buildPythonPackage rec {
dconf dconf
]; ];
patchPhase = ''
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
'';
configurePhase = '' configurePhase = ''
sed -i 's/from distutils.core/from setuptools/g' setup.py sed -i 's/from distutils.core/from setuptools/g' setup.py
sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py

1
pkgs/top-level/all-packages.nix
View File

@ -13086,6 +13086,7 @@ let
dconf = gnome3.dconf; dconf = gnome3.dconf;
gtkvnc = gtkvnc.override { enableGTK3 = true; }; gtkvnc = gtkvnc.override { enableGTK3 = true; };
spice_gtk = spice_gtk.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; };
system-libvirt = libvirt;
}; };
virtinst = callPackage ../applications/virtualization/virtinst {}; virtinst = callPackage ../applications/virtualization/virtinst {};