libvirt packages: fix & clean up dependencies
This commit is contained in:
parent
d109f3d5f6
commit
0018cd5a2d
@ -1,13 +1,13 @@
|
|||||||
{ stdenv, fetchurl, python2Packages, intltool, curl, file
|
{ stdenv, fetchurl, python2Packages, intltool, file
|
||||||
, wrapGAppsHook, virtinst, gtkvnc, vte
|
, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
|
||||||
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
|
, gobjectIntrospection, libvirt-glib, system-libvirt
|
||||||
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
|
, gsettings_desktop_schemas, glib, libosinfo, gnome3
|
||||||
|
, spiceSupport ? true, spice_gtk ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
with python2Packages;
|
|
||||||
|
|
||||||
buildPythonApplication rec {
|
python2Packages.buildPythonApplication rec {
|
||||||
name = "virt-manager-${version}";
|
name = "virt-manager-${version}";
|
||||||
version = "1.4.1";
|
version = "1.4.1";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
@ -17,17 +17,19 @@ buildPythonApplication rec {
|
|||||||
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
|
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs =
|
nativeBuildInputs = [ wrapGAppsHook intltool file ];
|
||||||
[ eventlet greenlet gflags netaddr carrot routes
|
|
||||||
PasteDeploy m2crypto ipy twisted
|
buildInputs =
|
||||||
distutils_extra simplejson glanceclient cheetah lockfile httplib2
|
[ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
|
||||||
urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
|
gsettings_desktop_schemas libosinfo
|
||||||
libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
|
|
||||||
gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
|
|
||||||
wrapGAppsHook
|
|
||||||
] ++ optional spiceSupport spice_gtk;
|
] ++ optional spiceSupport spice_gtk;
|
||||||
|
|
||||||
buildInputs = [ dconf avahi intltool file ];
|
propagatedBuildInputs = with python2Packages;
|
||||||
|
[ eventlet greenlet gflags netaddr carrot routes PasteDeploy
|
||||||
|
m2crypto ipy twisted distutils_extra simplejson glanceclient
|
||||||
|
cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python
|
||||||
|
pygobject3 ipaddr mox libvirt libxml2
|
||||||
|
];
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
|
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
|
||||||
@ -35,7 +37,7 @@ buildPythonApplication rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
postConfigure = ''
|
postConfigure = ''
|
||||||
${python.interpreter} setup.py configure --prefix=$out
|
${python2Packages.python.interpreter} setup.py configure --prefix=$out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
|
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
|
||||||
, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
|
, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
|
||||||
, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib
|
, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
|
||||||
, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
|
, libapparmor
|
||||||
|
, spiceSupport ? true
|
||||||
|
, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert spiceSupport ->
|
assert spiceSupport ->
|
||||||
@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
|
sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgconfig intltool ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
|
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
|
||||||
shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
|
libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
|
||||||
numactl libvirt-glib
|
libcap_ng numactl libapparmor xen
|
||||||
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm
|
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
|
||||||
] ++ optional (stdenv.system == "x86_64-linux") xen;
|
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
for f in "$out"/bin/*; do
|
for f in "$out"/bin/*; do
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
|
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
|
||||||
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
|
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
|
||||||
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
|
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
|
||||||
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
|
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils
|
||||||
, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
|
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
|
||||||
, libusb, libarchive, acl, libgudev, qemu, libsecret
|
, libcap_ng, numactl, xen, libapparmor
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# TODO: ovirt (optional)
|
# TODO: ovirt (optional)
|
||||||
@ -15,12 +15,16 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
makeWrapper pkgconfig intltool
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
makeWrapper pkgconfig intltool itstool libvirt-glib glib
|
itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
|
||||||
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
|
libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
|
||||||
libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
|
tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
|
||||||
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
|
gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
|
||||||
librsvg desktop_file_utils acl libgudev numactl xen libsecret
|
libcap_ng numactl xen libapparmor
|
||||||
];
|
];
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
|
@ -23,12 +23,11 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
libxml2 gnutls perl python2 readline
|
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
|
||||||
gettext libtasn1 libgcrypt yajl attr
|
attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap
|
||||||
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
|
|
||||||
] ++ optionals stdenv.isLinux [
|
] ++ optionals stdenv.isLinux [
|
||||||
libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
|
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
|
||||||
libnl numad numactl xen zfs libapparmor
|
libapparmor libcap_ng numactl xen
|
||||||
] ++ optionals stdenv.isDarwin [
|
] ++ optionals stdenv.isDarwin [
|
||||||
libiconv gmp
|
libiconv gmp
|
||||||
];
|
];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user