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

Commits on Aug 27, 2019

  1. gnome3.gnome-control-center: add optional sharing deps 

    It appears that if gnome-control-center isn't wrapped with their
schemas they won't be added to the panel.
    @worldofpeace
    worldofpeace committed Aug 27, 2019
    Copy the full SHA
    f1ce41d View commit details

  2. nixos/gnome-user-share: cleanup 

    * No sessionPath!

* add to systemd.packages
  This is for the gnome-user-share-webdav.service.

* Update option description
    @worldofpeace
    worldofpeace committed Aug 27, 2019
    Copy the full SHA
    8a24bc2 View commit details

  3. Merge pull request #67549 from worldofpeace/gnome-control-center/fix-… 

    …sharing

Fix sharing in gnome-control-center
    @worldofpeace
    worldofpeace authored Aug 27, 2019
    Copy the full SHA
    156f335 View commit details
Showing with 11 additions and 13 deletions.
  1. +7 −13 nixos/modules/services/desktops/gnome3/gnome-user-share.nix
  2. +4 −0 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
20 changes: 7 additions & 13 deletions nixos/modules/services/desktops/gnome3/gnome-user-share.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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