diff options
author | Robin Gloster <mail@glob.in> | 2019-08-29 15:20:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-29 15:20:17 +0200 |
commit | cbd4d59daf08001801ded64a0d319984a5ed80b3 (patch) | |
tree | 11426db130769d1398da26c72455e7bc8fcee48f | |
parent | 0fc011ed25c93d1da5a08a2990cef39a5b26f24e (diff) | |
parent | 4471efd9e0881273f01d9d96ca30bc9e316994e5 (diff) | |
download | nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar.gz nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar.bz2 nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar.lz nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar.xz nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.tar.zst nixlib-cbd4d59daf08001801ded64a0d319984a5ed80b3.zip |
Merge pull request #67177 from Izorkin/virt-viewer
virt-viewer: remove unused packages
-rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/libvirt-glib/default.nix | 22 |
2 files changed, 14 insertions, 26 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index eb5d53c2b89f..3d0589032009 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,10 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl -, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl -, libapparmor, gst_all_1 +{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null -, xenSupport ? false, xen ? null }: assert spiceSupport -> @@ -22,13 +19,9 @@ stdenv.mkDerivation rec { sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ - glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas libvirt-glib - libcap_ng numactl libapparmor - ] ++ optionals xenSupport [ - xen + glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm ]; @@ -36,6 +29,9 @@ stdenv.mkDerivation rec { # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + strictDeps = true; + enableParallelBuilding = true; + meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 9dd89133f4b9..1803ce1dc20a 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,12 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl -, libapparmor, vala -, xenSupport ? false, xen ? null +{ stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala +, libcap_ng, libvirt, libxml2 }: -let - inherit (pythonPackages) python pygobject2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "libvirt-glib-2.0.0"; outputs = [ "out" "dev" ]; @@ -16,15 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; }; - nativeBuildInputs = [ pkgconfig vala ]; - buildInputs = [ - libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobject-introspection libcap_ng numactl libapparmor - ] ++ stdenv.lib.optionals xenSupport [ - xen - ]; + nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; + buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ]; enableParallelBuilding = true; + strictDeps = true; meta = with stdenv.lib; { description = "Library for working with virtual machines"; @@ -36,7 +28,7 @@ in stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = http://libvirt.org/; + homepage = https://libvirt.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; }; |