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

virt-viewer: support ALSA

Browse Source
This commit is contained in:
gnidorah 2018-05-11 20:49:14 +03:00
parent c9e7b380e5
commit 30dc291331
2 changed files with 7 additions and 4 deletions
pkgs
applications/virtualization/virt-viewer
default.nix
development/libraries/spice-gtk
default.nix

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libapparmor , 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
}: }:
@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
xen xen
] ++ optionals spiceSupport [ ] ++ optionals spiceSupport [
spice-gtk spice-protocol libcap gdbm spice-gtk spice-protocol libcap gdbm
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
]; ];
postInstall = '' postInstall = ''
for f in "$out"/bin/*; do 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 done
''; '';

4
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -2,7 +2,7 @@
, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
, withPolkit ? true, polkit, acl, usbutils , 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), # If this package is built with polkit support (withPolkit=true),
# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = [ 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 libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm
] ++ optionals withPolkit [ polkit acl usbutils ] ; ] ++ optionals withPolkit [ polkit acl usbutils ] ;