b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libvirt packages: fix & clean up dependencies

Browse source
This commit is contained in:
Franz Pletz 2017-03-28 19:13:39 +02:00
parent d109f3d5f6
commit 0018cd5a2d
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
4 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/applications/virtualization/virt-manager/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, python2Packages, intltool, curl, file
, wrapGAppsHook, virtinst, gtkvnc, vte
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
{ stdenv, fetchurl, python2Packages, intltool, file
, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf
, gobjectIntrospection, libvirt-glib, system-libvirt
, gsettings_desktop_schemas, glib, libosinfo, gnome3
, spiceSupport ? true, spice_gtk ? null
}:
with stdenv.lib;
with python2Packages;
buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
version = "1.4.1";
namePrefix = "";
@ -17,17 +17,19 @@ buildPythonApplication rec {
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
};
propagatedBuildInputs =
[ eventlet greenlet gflags netaddr carrot routes
PasteDeploy m2crypto ipy twisted
distutils_extra simplejson glanceclient cheetah lockfile httplib2
urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3
libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox
gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme
wrapGAppsHook
nativeBuildInputs = [ wrapGAppsHook intltool file ];
buildInputs =
[ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi
gsettings_desktop_schemas libosinfo
] ++ 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 = ''
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 = ''
${python.interpreter} setup.py configure --prefix=$out
${python2Packages.python.interpreter} setup.py configure --prefix=$out
'';
postInstall = ''

18
pkgs/applications/virtualization/virt-viewer/default.nix
View file

@ -1,7 +1,9 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib
, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libapparmor
, spiceSupport ? true
, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
}:
assert spiceSupport ->
@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
};
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
numactl libvirt-glib
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm
] ++ optional (stdenv.system == "x86_64-linux") xen;
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
libcap_ng numactl libapparmor xen
] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
postInstall = ''
for f in "$out"/bin/*; do

20
pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32
, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
, libusb, libarchive, acl, libgudev, qemu, libsecret
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
, libcap_ng, numactl, xen, libapparmor
}:
# TODO: ovirt (optional)
@ -15,12 +15,16 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [
makeWrapper pkgconfig intltool
];
buildInputs = [
makeWrapper pkgconfig intltool itstool libvirt-glib glib
gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp
gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
librsvg desktop_file_utils acl libgudev numactl xen libsecret
itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc
libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd
tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive
gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret
libcap_ng numactl xen libapparmor
];
preFixup = ''

9
pkgs/development/libraries/libvirt/default.nix
View file

@ -23,12 +23,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [
libxml2 gnutls perl python2 readline
gettext libtasn1 libgcrypt yajl attr
libxslt xhtml1 perlPackages.XMLXPath curl libpcap
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap
] ++ optionals stdenv.isLinux [
libpciaccess devicemapper lvm2 utillinux systemd libcap_ng
libnl numad numactl xen zfs libapparmor
libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
libapparmor libcap_ng numactl xen
] ++ optionals stdenv.isDarwin [
libiconv gmp
];