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: f6e1664e7d69
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87ec4fa2d130
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 3, 2019

  1. redshift: add geoclue config

    The geoclue module now lets us set application config. This should make
    it more robust in desktop environments that don't define a geoclue
    agent.
    
    Fixes #45994.
    michaelpj committed Jun 3, 2019
    Copy the full SHA
    01d06dc View commit details

Commits on Jun 5, 2019

  1. Merge pull request #62624 from michaelpj/fix/redshift-geoclue

    redshift: add geoclue config
    worldofpeace authored Jun 5, 2019
    Copy the full SHA
    87ec4fa View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 nixos/modules/services/x11/redshift.nix
8 changes: 7 additions & 1 deletion nixos/modules/services/x11/redshift.nix
Original file line number Diff line number Diff line change
@@ -119,7 +119,13 @@ in {
# needed so that .desktop files are installed, which geoclue cares about
environment.systemPackages = [ cfg.package ];

services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true;
services.geoclue2 = mkIf (cfg.provider == "geoclue2") {
enable = true;
appConfig."redshift" = {
isAllowed = true;
isSystem = true;
};
};

systemd.user.services.redshift =
let