commit 8b5dd47fe0db0834cebda33ad4b2d8f5ba4e9aa5 · pyrox.dev/nixpkgs

+32 -40
nixos/modules/services/system/dbus.nix
···

       1
       1
        
       # D-Bus configuration and system bus daemon.

     

       2
       2
        
       

     

       3
       3
       -
       { config, lib, options, pkgs, ... }:

     

       4
       4
       -
       

     

       5
       5
       -
       with lib;

     

       3
       3
       +
       { config, lib, pkgs, ... }:

     

       6
       4
        
       

     

       7
       5
        
       let

     

       8
       6
        
       

     
···

       16
       14
        
           serviceDirectories = cfg.packages;

     

       17
       15
        
         };

     

       18
       16
        
       

     

       17
       17
       +
         inherit (lib) mkOption types;

     

       18
       18
       +
       

     

       19
       19
        
       in

     

       20
       20
        
       

     

       21
       21
        
       {

     

       22
       22
       -
         ###### interface

     

       23
       23
       -
       

     

       24
       22
        
         options = {

     

       25
       23
        
       

     

       26
       24
        
           services.dbus = {

     
···

       65
       63
        
               '';

     

       66
       64
        
               default = "disabled";

     

       67
       65
        
             };

     

       68
       68
       -
       

     

       69
       69
       -
             socketActivated = mkOption {

     

       70
       70
       -
               type = types.nullOr types.bool;

     

       71
       71
       -
               default = null;

     

       72
       72
       -
               visible = false;

     

       73
       73
       -
               description = lib.mdDoc ''

     

       74
       74
       -
                 Removed option, do not use.

     

       75
       75
       -
               '';

     

       76
       76
       -
             };

     

       77
       66
        
           };

     

       78
       67
        
         };

     

       79
       68
        
       

     

       80
       80
       -
         ###### implementation

     

       81
       81
       -
       

     

       82
       82
       -
         config = mkIf cfg.enable {

     

       83
       83
       -
           warnings = optional (cfg.socketActivated != null) (

     

       84
       84
       -
             let

     

       85
       85
       -
               files = showFiles options.services.dbus.socketActivated.files;

     

       86
       86
       -
             in

     

       87
       87
       -
               "The option 'services.dbus.socketActivated' in ${files} no longer has"

     

       88
       88
       -
               + " any effect and can be safely removed: the user D-Bus session is"

     

       89
       89
       -
               + " now always socket activated."

     

       90
       90
       -
           );

     

       91
       91
       -
       

     

       92
       92
       -
           environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];

     

       69
       69
       +
         config = lib.mkIf cfg.enable {

     

       70
       70
       +
           environment.systemPackages = [

     

       71
       71
       +
             pkgs.dbus

     

       72
       72
       +
           ];

     

       93
       73
        
       

     

       94
       74
        
           environment.etc."dbus-1".source = configDir;

     

       95
       75
        
       

     
···

       102
       82
        
       

     

       103
       83
        
           users.groups.messagebus.gid = config.ids.gids.messagebus;

     

       104
       84
        
       

     

       105
       105
       -
           systemd.packages = [ pkgs.dbus.daemon ];

     

       85
       85
       +
           systemd.packages = [

     

       86
       86
       +
             pkgs.dbus

     

       87
       87
       +
           ];

     

       106
       88
        
       

     

       107
       89
        
           security.wrappers.dbus-daemon-launch-helper = {

     

       108
       108
       -
             source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";

     

       90
       90
       +
             source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";

     

       109
       91
        
             owner = "root";

     

       110
       92
        
             group = "messagebus";

     

       111
       93
        
             setuid = true;

     
···

       114
       96
        
           };

     

       115
       97
        
       

     

       116
       98
        
           services.dbus.packages = [

     

       117
       117
       -
             pkgs.dbus.out

     

       99
       99
       +
             pkgs.dbus

     

       118
       100
        
             config.system.path

     

       119
       101
        
           ];

     

       120
       102
        
       

     

       121
       103
        
           systemd.services.dbus = {

     

       122
       104
        
             # Don't restart dbus-daemon. Bad things tend to happen if we do.

     

       123
       105
        
             reloadIfChanged = true;

     

       124
       124
       -
             restartTriggers = [ configDir ];

     

       125
       125
       -
             environment = { LD_LIBRARY_PATH = config.system.nssModules.path; };

     

       106
       106
       +
             restartTriggers = [

     

       107
       107
       +
               configDir

     

       108
       108
       +
             ];

     

       109
       109
       +
             environment = {

     

       110
       110
       +
               LD_LIBRARY_PATH = config.system.nssModules.path;

     

       111
       111
       +
             };

     

       126
       112
        
           };

     

       127
       113
        
       

     

       128
       128
       -
           systemd.user = {

     

       129
       129
       -
             services.dbus = {

     

       130
       130
       -
               # Don't restart dbus-daemon. Bad things tend to happen if we do.

     

       131
       131
       -
               reloadIfChanged = true;

     

       132
       132
       -
               restartTriggers = [ configDir ];

     

       133
       133
       -
             };

     

       134
       134
       -
             sockets.dbus.wantedBy = [ "sockets.target" ];

     

       114
       114
       +
           systemd.user.services.dbus = {

     

       115
       115
       +
             # Don't restart dbus-daemon. Bad things tend to happen if we do.

     

       116
       116
       +
             reloadIfChanged = true;

     

       117
       117
       +
             restartTriggers = [

     

       118
       118
       +
               configDir

     

       119
       119
       +
             ];

     

       135
       120
        
           };

     

       136
       121
        
       

     

       137
       137
       -
           environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];

     

       122
       122
       +
           systemd.user.sockets.dbus.wantedBy = [

     

       123
       123
       +
             "sockets.target"

     

       124
       124
       +
           ];

     

       125
       125
       +
       

     

       126
       126
       +
           environment.pathsToLink = [

     

       127
       127
       +
             "/etc/dbus-1"

     

       128
       128
       +
             "/share/dbus-1"

     

       129
       129
       +
           ];

     

       138
       130
        
         };

     

       139
       131
        
       }