From 7a0dfc93bc27d9e4dd29ddf126bdd3715048e8ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 14:59:47 +0200 Subject: virtviewer: clean up --- pkgs/applications/virtualization/virt-viewer/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 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 2296d7217ec1..cbdecb322882 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen -, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl , libapparmor, gst_all_1 , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; buildInputs = [ glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib + libvirt yajl gsettings-desktop-schemas libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen @@ -33,14 +33,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - postInstall = '' - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - done - ''; - meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; -- cgit 1.4.1