From 0018cd5a2ddd858f78cffd0bd8a2412d5b507088 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Mar 2017 19:13:39 +0200 Subject: libvirt packages: fix & clean up dependencies --- .../virtualization/virt-viewer/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'pkgs/applications/virtualization/virt-viewer') 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 -- cgit 1.4.1