diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 10:50:18 +0100 |
| commit | 4f08b0fbac17c201216abbd776ce3bb292ed4946 (patch) | |
| tree | 129bb0b85b424612237e81d2cf303f7d5c0200fe /pkgs/desktops/gnome-3/core/vino/default.nix | |
| parent | 6b381d4c9bed35caee62265a92986cec189243b2 (diff) | |
| parent | 1d6abdd1775d12f7a90414c6e6b4c45ffc612246 (diff) | |
| download | nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.gz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.bz2 nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.lz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.xz nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.tar.zst nixpkgs-4f08b0fbac17c201216abbd776ce3bb292ed4946.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops/gnome-3/core/vino/default.nix')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/vino/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix index bd446623fc2..4eadcc05760 100644 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/core/vino/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, lib, wrapGAppsHook , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup -, telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null +, 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 +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null , networkmanager ? null }: with lib; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ wrapGAppsHook pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup - ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ] - ++ optional gnomeKeyringSupport libgnome_keyring3 + ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ] + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ filter (p: p != null) [ libsecret gnutls libgcrypt avahi zlib libjpeg libXdamage libXfixes libXext networkmanager |