diff options
| author | Matthijs Steen <emailmatthijs@gmail.com> | 2016-06-23 16:07:57 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2016-08-07 04:26:00 +0200 |
| commit | 216ae3141a48544969ea094dc21071b3822b353b (patch) | |
| tree | ae652d0af58e1f2055168a3e5c338b94dda42918 /pkgs | |
| parent | 687a012ba83285f92d58e5784b36b2ba03d574fc (diff) | |
| download | nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar.gz nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar.bz2 nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar.lz nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar.xz nixlib-216ae3141a48544969ea094dc21071b3822b353b.tar.zst nixlib-216ae3141a48544969ea094dc21071b3822b353b.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/vino/default.nix | 24 |
1 files changed, 19 insertions, 5 deletions
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" \ |