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

Commits on May 19, 2019

  1. nixos/geoclue2: don't run as root

    @worldofpeace
    worldofpeace committed May 19, 2019
    Copy the full SHA
    82135b6 View commit details

Commits on Jun 5, 2019

  1. Merge pull request #61729 from worldofpeace/geoclue/no-root 

    nixos/geoclue2: don't run as root
    @worldofpeace
    worldofpeace authored Jun 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    094e150 View commit details
Showing with 14 additions and 0 deletions.
  1. +13 −0 nixos/modules/services/desktops/geoclue2.nix
  2. +1 −0 pkgs/development/libraries/geoclue/default.nix
13 changes: 13 additions & 0 deletions nixos/modules/services/desktops/geoclue2.nix
View file
Original file line number Diff line number Diff line change
@@ -188,6 +188,19 @@ in

systemd.packages = [ package ];

users.users.geoclue = {
isSystemUser = true;
home = "/var/lib/geoclue";
group = "geoclue";
description = "Geoinformation service";
};

users.groups.geoclue = {};

systemd.tmpfiles.rules = [
"d /var/lib/geoclue 0755 geoclue geoclue"
];

# restart geoclue service when the configuration changes
systemd.services."geoclue".restartTriggers = [
config.environment.etc."geoclue/geoclue.conf".source
1 change: 1 addition & 0 deletions pkgs/development/libraries/geoclue/default.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
"-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Ddbus-srv-user=geoclue"
] ++ optionals stdenv.isDarwin [
"-D3g-source=false"
"-Dcdma-source=false"