diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-03 13:52:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-03 13:52:13 +0200 |
| commit | 448d7d648d1a2e8aacc85f9d0abc90643ca2e89b (patch) | |
| tree | 7b4b3772a4008054f926ae3b0f3b9b3ff0857b16 /pkgs/applications | |
| parent | 318920725a434db62d1b254b0ba53b211b3756a9 (diff) | |
| parent | 52fdec3c1dedaf9c7396d0ee5532135a64ed2075 (diff) | |
| download | nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar.gz nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar.bz2 nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar.lz nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar.xz nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.tar.zst nixlib-448d7d648d1a2e8aacc85f9d0abc90643ca2e89b.zip | |
Merge branch 'staging'
It's only half-rebuilt on Hydra, but it brings a security fix.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 7 |
1 files changed, 5 insertions, 2 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 ''; |