summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-05-18 07:56:01 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2017-05-18 08:22:14 +0200
commit0eff1d9f2af05353a827a3896ebcc2bce20d2fdd (patch)
treeef9df15b8a4680330b223b4a4961a7d57085b5cc /pkgs/desktops
parenteda502d143f21189f87952abedd5cf00565d44dc (diff)
downloadnixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar.gz
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar.bz2
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar.lz
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar.xz
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.tar.zst
nixlib-0eff1d9f2af05353a827a3896ebcc2bce20d2fdd.zip
vino: use wrapGAppsHook
Fixes this:

  .vino-server-wr[8931]: Using the 'memory' GSettings backend. \
  Your settings will not be saved or shared with other applications.

Still, the screen sharing settings under "gnome-control-center sharing"
does not seem to be persisted (except the enabling/disabling sharing
flag itself). Making changes and then re-opening gnome-control-center
shows the default screen sharing settings. Sigh.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/3.22/core/vino/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
index f0fbc9c348b5..bd446623fc25 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/vino/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, makeWrapper
+{ stdenv, fetchurl, lib, wrapGAppsHook
 , pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
 , telepathySupport ? false, dbus_glib ? null, telepathy_glib ? null
 , libsecret ? null, gnutls ? null, libgcrypt ? null, avahi ? null
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [
-    makeWrapper
+    wrapGAppsHook
     pkgconfig gnome3.defaultIconTheme gtk3 glib intltool libXtst libnotify libsoup
   ] ++ optionals telepathySupport [ dbus_glib telepathy_glib ]
     ++ optional gnomeKeyringSupport libgnome_keyring3
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
     ];
 
   preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$out/share/gsettings-schemas/${name}:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {