Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3e54ca95fab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ece08dee6b8
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on May 19, 2017

  1. vino: add missing gsettings schema 

    Fixes this:

  $ ./result/libexec/vino-server
  ...
  (vino-server:13915): GLib-GIO-ERROR **: Settings schema 'org.gnome.Vino' is not installed

(cherry picked from commit 94c47b0)
    @bjornfor
    bjornfor committed May 19, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    582e8d0 View commit details

  2. nixos/gnome3: fix screen sharing 

    Without this change there will be silent errors when enabling screen
sharing. The GUI thinks it enables the service when it in fact does not
(errors are seen in the system journal).

vino is already in the closure of gnome-control-center, so this is
basically free.

Configuration of screen sharing is done in GNOME control center.

(cherry picked from commit f9633c7)
    @bjornfor
    bjornfor committed May 19, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    836e237 View commit details

  3. 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.

(cherry picked from commit 0eff1d9)
    @bjornfor
    bjornfor committed May 19, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    panzarino Zach Panzarino
    GPG key ID: F94784F2C7F9CE32
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ece08d View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  2. +3 −4 pkgs/desktops/gnome-3/3.22/core/vino/default.nix
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
View file
Original file line number Diff line number Diff line change
@@ -123,6 +123,7 @@ in {
hardware.bluetooth.enable = mkDefault true;
services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ];
systemd.packages = [ pkgs.gnome3.vino ];

# If gnome3 is installed, build vim for gtk3 too.
nixpkgs.config.vim.gui = "gtk3";
7 changes: 3 additions & 4 deletions pkgs/desktops/gnome-3/3.22/core/vino/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
export GSETTINGS_SCHEMAS_PATH="$out/share/gsettings-schemas/${name}:$GSETTINGS_SCHEMAS_PATH"
'';

meta = with stdenv.lib; {