public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome 3.12: make remote desktop sharing work

Browse Source
This commit is contained in:
Luca Bruno 2014-05-26 17:17:25 +02:00
parent c4086f9185
commit 6b21186742
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -87,8 +87,9 @@ in {
export XDG_MENU_PREFIX=gnome export XDG_MENU_PREFIX=gnome
# Don't let epiphany depend upon gnome-shell # Don't let epiphany depend upon gnome-shell
# Don't let gnome-session depend upon vino (for .desktop autostart condition)
# Override default mimeapps # 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 # Let gnome-control-center find gnome-shell search providers
export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/ export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/

2
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk 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 ]; networkmanager modemmanager makeWrapper ];
preBuild = '' preBuild = ''

5
pkgs/desktops/gnome-3/3.12/core/vino/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
, libnotify, file }: , libnotify, file, telepathy_glib, dbus_glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vino-${versionMajor}.${versionMinor}"; name = "vino-${versionMajor}.${versionMinor}";
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
doCheck = true; 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 = '' preFixup = ''
wrapProgram "$out/libexec/vino-server" \ wrapProgram "$out/libexec/vino-server" \