diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-05-26 17:17:25 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-05-26 17:18:04 +0200 |
| commit | 6b21186742722732ab99c4c99dc17c9685be19b4 (patch) | |
| tree | dc27672b56a2e34965b27a4171507da1a4e2bb5c | |
| parent | c4086f9185dc3c40780c991c22062f8ac4884ecc (diff) | |
| download | nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar.gz nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar.bz2 nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar.lz nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar.xz nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.tar.zst nixlib-6b21186742722732ab99c4c99dc17c9685be19b4.zip | |
gnome 3.12: make remote desktop sharing work
3 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d1c86088833..0b81a3f2d9bb 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -87,8 +87,9 @@ in { export XDG_MENU_PREFIX=gnome # Don't let epiphany depend upon gnome-shell + # Don't let gnome-session depend upon vino (for .desktop autostart condition) # Override default mimeapps - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${gnome3.vino}/share/gsettings-schemas/${gnome3.vino.name}:${mimeAppsList}/share # Let gnome-control-center find gnome-shell search providers export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix index 967c19af540a..eb2324c9c0f2 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino networkmanager modemmanager makeWrapper ]; preBuild = '' diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix index 2318e68930e0..8580af9b8841 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, libnotify, file }: +, libnotify, file, telepathy_glib, dbus_glib }: stdenv.mkDerivation rec { name = "vino-${versionMajor}.${versionMinor}"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { doCheck = true; - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ]; + buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify + dbus_glib telepathy_glib file makeWrapper ]; preFixup = '' wrapProgram "$out/libexec/vino-server" \ |