forked from mirrors/nixpkgs
gnome 3.12: make remote desktop sharing work
This commit is contained in:
parent
c4086f9185
commit
6b21186742
|
@ -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/
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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" \
|
||||
|
|
Loading…
Reference in a new issue