diff options
| -rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index eb48e1d3d300..33e12d109854 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen , gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl -, libapparmor +, libapparmor, gst_all_1 , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null }: @@ -30,11 +30,14 @@ stdenv.mkDerivation rec { xen ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm + 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" + wrapProgram "$f" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" done ''; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 05fd952eb2e8..1b054334c691 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -2,7 +2,7 @@ , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , withPolkit ? true, polkit, acl, usbutils -, vala, gtk3, epoxy, libdrm }: +, vala, gtk3, epoxy, libdrm, gst_all_1 }: # If this package is built with polkit support (withPolkit=true), # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - spice-protocol celt_0_5_1 openssl libpulseaudio pixman + spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm ] ++ optionals withPolkit [ polkit acl usbutils ] ; |