public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67177 from Izorkin/virt-viewer

Browse Source 
virt-viewer: remove unused packages
This commit is contained in:
Robin Gloster 2019-08-29 15:20:17 +02:00 committed by GitHub
commit cbd4d59daf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp { stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl , glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
, libapparmor, gst_all_1
, spiceSupport ? true , spiceSupport ? true
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
, xenSupport ? false, xen ? null
}: }:
assert spiceSupport -> assert spiceSupport ->
@ -22,13 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw";
}; };
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ];
buildInputs = [ buildInputs = [
glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
libvirt yajl gsettings-desktop-schemas libvirt-glib
libcap_ng numactl libapparmor
] ++ optionals xenSupport [
xen
] ++ optionals spiceSupport [ ] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm spice-gtk spice-protocol libcap gdbm
]; ];
@ -36,6 +29,9 @@ stdenv.mkDerivation rec {
# Required for USB redirection PolicyKit rules file # Required for USB redirection PolicyKit rules file
propagatedUserEnvPkgs = optional spiceSupport spice-gtk; propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
strictDeps = true;
enableParallelBuilding = true;
meta = { meta = {
description = "A viewer for remote virtual machines"; description = "A viewer for remote virtual machines";
maintainers = [ maintainers.raskin ]; maintainers = [ maintainers.raskin ];

22
pkgs/development/libraries/libvirt-glib/default.nix
View File

@ -1,12 +1,8 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl { stdenv, fetchurl, pkgconfig, gobject-introspection, intltool, vala
, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl , libcap_ng, libvirt, libxml2
, libapparmor, vala
, xenSupport ? false, xen ? null
}: }:
let stdenv.mkDerivation rec {
inherit (pythonPackages) python pygobject2;
in stdenv.mkDerivation rec {
name = "libvirt-glib-2.0.0"; name = "libvirt-glib-2.0.0";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -16,15 +12,11 @@ in stdenv.mkDerivation rec {
sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l";
}; };
nativeBuildInputs = [ pkgconfig vala ]; nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
buildInputs = [ buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
python pygobject2 gobject-introspection libcap_ng numactl libapparmor
] ++ stdenv.lib.optionals xenSupport [
xen
];
enableParallelBuilding = true; enableParallelBuilding = true;
strictDeps = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for working with virtual machines"; description = "Library for working with virtual machines";
@ -36,7 +28,7 @@ in stdenv.mkDerivation rec {
- libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gconfig - GObjects for manipulating libvirt XML documents
- libvirt-gobject - GObjects for managing libvirt objects - libvirt-gobject - GObjects for managing libvirt objects
''; '';
homepage = http://libvirt.org/; homepage = https://libvirt.org/;
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };