From 556151911edca15737ca4b7fa6199a2b960f924e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 15 Oct 2015 16:46:14 -0400 Subject: virt-manager: Fixup path to libvirt's cpu_map.xml --- pkgs/applications/virtualization/virt-manager/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index d2305f83067..772355653cb 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python , wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte , 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; @@ -22,7 +22,7 @@ buildPythonPackage rec { paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 - libvirt libxml2Python ipaddr vte libosinfo + libxml2Python ipaddr vte libosinfo ] ++ optional spiceSupport spice_gtk; buildInputs = @@ -40,6 +40,10 @@ buildPythonPackage rec { dconf ]; + patchPhase = '' + sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py + ''; + configurePhase = '' 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 -- cgit 1.4.1