commit 316669327c6cb0e85dc522f0b7af55db33474553 · pyrox.dev/nixpkgs

+30 -5

nixos/modules/services/desktops/geoclue2.nix

···

       4
       4
        
       

     

       5
       5
        
       with lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         # the demo agent isn't built by default, but we need it here

     

       9
       9
       +
         package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; };

     

       10
       10
       +
       in

     

       7
       11
        
       {

     

       8
       12
        
       

     

       9
       13
        
         ###### interface

     
···

       21
       25
        
               '';

     

       22
       26
        
             };

     

       23
       27
        
       

     

       28
       28
       +
             enableDemoAgent = mkOption {

     

       29
       29
       +
               type = types.bool;

     

       30
       30
       +
               default = true;

     

       31
       31
       +
               description = ''

     

       32
       32
       +
                 Whether to use the GeoClue demo agent. This should be

     

       33
       33
       +
                 overridden by desktop environments that provide their own

     

       34
       34
       +
                 agent.

     

       35
       35
       +
               '';

     

       36
       36
       +
             };

     

       37
       37
       +
       

     

       24
       38
        
           };

     

       25
       39
        
       

     

       26
       40
        
         };

     

       27
       41
        
       

     

       28
       42
        
       

     

       29
       43
        
         ###### implementation

     

       30
       30
       -
       

     

       31
       44
        
         config = mkIf config.services.geoclue2.enable {

     

       32
       45
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.geoclue2 ];

     

       46
       46
       +
           environment.systemPackages = [ package ];

     

       34
       47
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.geoclue2 ];

     

       48
       48
       +
           services.dbus.packages = [ package ];

     

       36
       49
        
       

     

       37
       37
       -
           systemd.packages = [ pkgs.geoclue2 ];

     

       38
       38
       -
       

     

       50
       50
       +
           systemd.packages = [ package ];

     

       51
       51
       +
         

     

       52
       52
       +
           # this needs to run as a user service, since it's associated with the

     

       53
       53
       +
           # user who is making the requests

     

       54
       54
       +
           systemd.user.services = mkIf config.services.geoclue2.enableDemoAgent { 

     

       55
       55
       +
             "geoclue-agent" = {

     

       56
       56
       +
               description = "Geoclue agent";

     

       57
       57
       +
               script = "${package}/libexec/geoclue-2.0/demos/agent";

     

       58
       58
       +
               # this should really be `partOf = [ "geoclue.service" ]`, but

     

       59
       59
       +
               # we can't be part of a system service, and the agent should

     

       60
       60
       +
               # be okay with the main service coming and going

     

       61
       61
       +
               wantedBy = [ "default.target" ];

     

       62
       62
       +
             };

     

       63
       63
       +
           };

     

       39
       64
        
         };

     

       40
       65
        
       

     

       41
       66
        
       }

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       93
       93
        
           services.udisks2.enable = true;

     

       94
       94
        
           services.accounts-daemon.enable = true;

     

       95
       95
        
           services.geoclue2.enable = mkDefault true;

     

       96
       96
       +
           # GNOME should have its own geoclue agent

     

       97
       97
       +
           services.geoclue2.enableDemoAgent = false;

     

       96
       98
        
           services.dleyna-renderer.enable = mkDefault true;

     

       97
       99
        
           services.dleyna-server.enable = mkDefault true;

     

       98
       100
        
           services.gnome3.at-spi2-core.enable = true;