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: 93790456642b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f9633c779153
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 17, 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
    @bjornfor
    bjornfor committed May 17, 2017
    Copy the full SHA
    94c47b0 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.
    @bjornfor
    bjornfor committed May 17, 2017
    Copy the full SHA
    f9633c7 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  2. +1 −1 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
@@ -124,6 +124,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";
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-3/3.22/core/vino/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

preFixup = ''
wrapProgram "$out/libexec/vino-server" \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "$out/share:$out/share/gsettings-schemas/${name}:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
'';

meta = with stdenv.lib; {