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

Merge pull request #67549 from worldofpeace/gnome-control-center/fix-sharing

Browse Source 
Fix sharing in gnome-control-center
This commit is contained in:
worldofpeace 2019-08-27 14:28:15 -04:00 committed by GitHub
commit 156f335161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/desktops/gnome3/gnome-user-share.nix
View File

@ -12,14 +12,7 @@ with lib;
services.gnome3.gnome-user-share = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable GNOME User Share, a service that exports the
contents of the Public folder in your home directory on the local network.
'';
};
enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";
};
@ -30,12 +23,13 @@ with lib;
config = mkIf config.services.gnome3.gnome-user-share.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
environment.systemPackages = [
pkgs.gnome3.gnome-user-share
];
services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
# Don't let gnome-control-center depend upon gnome-user-share
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
'';
systemd.packages = [
pkgs.gnome3.gnome-user-share
];
};

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

@ -60,6 +60,8 @@
, udisks2
, upower
, vino
, gnome-user-share
, gnome-remote-desktop
, wrapGAppsHook
}:
@ -99,7 +101,9 @@ stdenv.mkDerivation rec {
gnome-bluetooth
gnome-desktop
gnome-online-accounts
gnome-remote-desktop # optional, sharing panel
gnome-settings-daemon
gnome-user-share # optional, sharing panel
grilo
grilo-plugins # for setting wallpaper from Flickr
gsettings-desktop-schemas