commit fe51bf322c3a4aa8552cfb13d989412a3f4f8619 · 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
        
       }

+2 -8

nixos/modules/services/system/localtime.nix

···

       22
       22
        
         config = mkIf cfg.enable {

     

       23
       23
        
           services.geoclue2.enable = true;

     

       24
       24
        
       

     

       25
       25
       -
           security.polkit.extraConfig = ''

     

       26
       26
       -
            polkit.addRule(function(action, subject) {

     

       27
       27
       -
              if (action.id == "org.freedesktop.timedate1.set-timezone"

     

       28
       28
       -
                  && subject.user == "localtimed") {

     

       29
       29
       -
                return polkit.Result.YES;

     

       30
       30
       -
              }

     

       31
       31
       -
            });

     

       32
       32
       -
           '';

     

       25
       25
       +
           # so polkit will pick up the rules

     

       26
       26
       +
           environment.systemPackages = [ pkgs.localtime ];

     

       33
       27
        
       

     

       34
       28
        
           users.users = [{

     

       35
       29
        
             name = "localtimed";

+2

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

···

       97
       97
        
           services.udisks2.enable = true;

     

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

     

       99
       99
        
           services.geoclue2.enable = mkDefault true;

     

       100
       100
       +
           # GNOME should have its own geoclue agent

     

       101
       101
       +
           services.geoclue2.enableDemoAgent = false;

     

       100
       102
        
           services.dleyna-renderer.enable = mkDefault true;

     

       101
       103
        
           services.dleyna-server.enable = mkDefault true;

     

       102
       104
        
           services.gnome3.at-spi2-core.enable = true;

+3

nixos/modules/services/x11/redshift.nix

···

       116
       116
        
             }

     

       117
       117
        
           ];

     

       118
       118
        
       

     

       119
       119
       +
           # needed so that .desktop files are installed, which geoclue cares about

     

       120
       120
       +
           environment.systemPackages = [ cfg.package ];

     

       121
       121
       +
       

     

       119
       122
        
           services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true;

     

       120
       123
        
       

     

       121
       124
        
           systemd.user.services.redshift =

+9

pkgs/applications/misc/redshift/default.nix

···

       61
       61
        
       

     

       62
       62
        
         postFixup = "wrapPythonPrograms";

     

       63
       63
        
       

     

       64
       64
       +
         # the geoclue agent may inspect these paths and expect them to be

     

       65
       65
       +
         # valid without having the correct $PATH set

     

       66
       66
       +
         postInstall = ''

     

       67
       67
       +
           substituteInPlace $out/share/applications/redshift.desktop \

     

       68
       68
       +
             --replace 'Exec=redshift' "Exec=$out/bin/redshift"

     

       69
       69
       +
           substituteInPlace $out/share/applications/redshift.desktop \

     

       70
       70
       +
             --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"

     

       71
       71
       +
         '';

     

       72
       72
       +
       

     

       64
       73
        
         enableParallelBuilding = true;

     

       65
       74
        
       

     

       66
       75
        
         meta = with stdenv.lib; {

+5 -8

pkgs/development/libraries/geoclue/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         name = "geoclue-${version}";

     

       10
       10
       -
         version = "2.4.10";

     

       10
       10
       +
         version = "2.4.12";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";

     

       14
       14
       -
           sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4";

     

       14
       14
       +
           sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         outputs = [ "out" "dev" "devdoc" ];

     

       18
       18
        
       

     

       19
       19
        
         nativeBuildInputs = [

     

       20
       20
       -
           pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection

     

       20
       20
       +
           pkgconfig intltool wrapGAppsHook gobjectIntrospection

     

       21
       21
       +
           # devdoc

     

       22
       22
       +
           gtk-doc docbook_xsl docbook_xml_dtd_412 

     

       21
       23
        
         ];

     

       22
       24
        
       

     

       23
       25
        
         buildInputs = [

     
···

       40
       42
        
           "--disable-modem-gps-source"

     

       41
       43
        
           "--disable-nmea-source"

     

       42
       44
        
         ];

     

       43
       43
       -
       

     

       44
       44
       -
         # https://gitlab.freedesktop.org/geoclue/geoclue/issues/73

     

       45
       45
       -
         postInstall = ''

     

       46
       46
       -
           sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"

     

       47
       47
       -
         '';

     

       48
       45
        
       

     

       49
       46
        
         meta = with stdenv.lib; {

     

       50
       47
        
           description = "Geolocation framework and some data providers";