diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-28 19:13:39 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-03-28 19:45:01 +0200 |
commit | 0018cd5a2ddd858f78cffd0bd8a2412d5b507088 (patch) | |
tree | 753cff568cf65c0f456ad3bda066b0e0117f33ef /pkgs/applications | |
parent | d109f3d5f67b752e4890fe8bb5c84ed0625d8fb2 (diff) | |
download | nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar.gz nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar.bz2 nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar.lz nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar.xz nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.tar.zst nixpkgs-0018cd5a2ddd858f78cffd0bd8a2412d5b507088.zip |
libvirt packages: fix & clean up dependencies
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 34 | ||||
-rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 18 |
2 files changed, 28 insertions, 24 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 3efcf6e582c..9bc2bc3db08 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -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 = '' diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index b8de872d6ff..3b8d0a7cf63 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -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 |