diff --git a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
index 336178f3729d..524813957563 100644
--- a/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.20/core/vino/default.nix
@@ -1,14 +1,28 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
+{ stdenv, fetchurl, lib, makeWrapper
+, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
+, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
+, libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
+, zlib ? null, libjpeg ? null
+, libXdamage ? null, libXfixes ? null, libXext ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, networkmanager ? null }:
+
+with lib;
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   doCheck = true;
 
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
-                  makeWrapper ];
+  buildInputs = [
+    makeWrapper
+    pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
+  ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
+    ++ optional gnomeKeyringSupport libgnome_keyring3
+    ++ filter (p: p != null) [
+      libsecret gnutls libgcrypt avahi zlib libjpeg
+      libXdamage libXfixes libXext networkmanager
+    ];
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \