lol

vino: fix dependencies again, fixes #16457

My previous pull request was for release-15.09,
and as such has not been reapplied in master (and thus release-16.09).

Previous message:
The libXtst dependency was missing, which was required to enable remote control.
The other dependencies have been updated as well to reflect the dependencies stated at:
https://wiki.gnome.org/Projects/Vino
https://git.gnome.org/browse/vino/tree/configure.ac

authored by

Matthijs Steen and committed by
Rok Garbas
216ae314 687a012b

+19 -5
+19 -5
pkgs/desktops/gnome-3/3.20/core/vino/default.nix
··· 1 - { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper 2 - , gnome3, libnotify, file, telepathy_glib, dbus_glib }: 1 + { stdenv, fetchurl, lib, makeWrapper 2 + , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup 3 + , telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null 4 + , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null 5 + , zlib ? null, libjpeg ? null 6 + , libXdamage ? null, libXfixes ? null, libXext ? null 7 + , gnomeKeyringSupport ? false, libgnome_keyring3 ? null 8 + , networkmanager ? null }: 9 + 10 + with lib; 3 11 4 12 stdenv.mkDerivation rec { 5 13 inherit (import ./src.nix fetchurl) name src; 6 14 7 15 doCheck = true; 8 16 9 - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify 10 - gnome3.defaultIconTheme dbus_glib telepathy_glib file 11 - makeWrapper ]; 17 + buildInputs = [ 18 + makeWrapper 19 + pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup 20 + ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] 21 + ++ optional gnomeKeyringSupport libgnome_keyring3 22 + ++ filter (p: p != null) [ 23 + libsecret gnutls libgcrypt avahi zlib libjpeg 24 + libXdamage libXfixes libXext networkmanager 25 + ]; 12 26 13 27 preFixup = '' 14 28 wrapProgram "$out/libexec/vino-server" \