nixos/dbus: add package options (#347923)

Author: FliegendeWurst

nixos/modules/services/system/dbus.nix

@@ -6,10 +6,9 @@ let
 
   cfg = config.services.dbus;
 
-  homeDir = "/run/dbus";
-
-  configDir = pkgs.makeDBusConf {
+  configDir = pkgs.makeDBusConf.override {
     inherit (cfg) apparmor;
+    dbus = cfg.dbusPackage;
     suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper";
     serviceDirectories = cfg.packages;
   };
@@ -37,6 +36,10 @@ in
         '';
       };
 
+      dbusPackage = lib.mkPackageOption pkgs "dbus" {};
+
+      brokerPackage = lib.mkPackageOption pkgs "dbus-broker" {};
+
       implementation = mkOption {
         type = types.enum [ "dbus" "broker" ];
         default = "dbus";
@@ -46,7 +49,6 @@ in
           performance and reliability, while keeping compatibility to the D-Bus
           reference implementation.
         '';
-
       };
 
       packages = mkOption {
@@ -94,7 +96,7 @@ in
       users.users.messagebus = {
         uid = config.ids.uids.messagebus;
         description = "D-Bus system message bus daemon user";
-        home = homeDir;
+        home = "/run/dbus";
         homeMode = "0755";
         group = "messagebus";
       };
@@ -103,16 +105,16 @@ in
 
       # Install dbus for dbus tools even when using dbus-broker
       environment.systemPackages = [
-        pkgs.dbus
+        cfg.dbusPackage
       ];
 
       # You still need the dbus reference implementation installed to use dbus-broker
       systemd.packages = [
-        pkgs.dbus
+        cfg.dbusPackage
       ];
 
       services.dbus.packages = [
-        pkgs.dbus
+        cfg.dbusPackage
         config.system.path
       ];
 
@@ -125,14 +127,15 @@ in
       boot.initrd.systemd = {
         users.messagebus = { };
         groups.messagebus = { };
-        contents."/etc/dbus-1".source = pkgs.makeDBusConf {
+        contents."/etc/dbus-1".source = pkgs.makeDBusConf.override {
           inherit (cfg) apparmor;
+          dbus = cfg.dbusPackage;
           suidHelper = "/bin/false";
-          serviceDirectories = [ pkgs.dbus config.boot.initrd.systemd.package ];
+          serviceDirectories = [ cfg.dbusPackage config.boot.initrd.systemd.package ];
         };
-        packages = [ pkgs.dbus ];
+        packages = [ cfg.dbusPackage ];
         storePaths = [
-          "${pkgs.dbus}/bin/dbus-daemon"
+          "${cfg.dbusPackage}/bin/dbus-daemon"
           "${config.boot.initrd.systemd.package}/share/dbus-1/system-services"
           "${config.boot.initrd.systemd.package}/share/dbus-1/system.d"
         ];
@@ -142,7 +145,7 @@ in
 
     (mkIf (cfg.implementation == "dbus") {
       security.wrappers.dbus-daemon-launch-helper = {
-        source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";
+        source = "${cfg.dbusPackage}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;
@@ -181,11 +184,11 @@ in
 
     (mkIf (cfg.implementation == "broker") {
       environment.systemPackages = [
-        pkgs.dbus-broker
+        cfg.brokerPackage
       ];
 
       systemd.packages = [
-        pkgs.dbus-broker
+        cfg.brokerPackage
       ];
 
       # Just to be sure we don't restart through the unit alias

pkgs/top-level/all-packages.nix

@@ -8889,10 +8889,7 @@ with pkgs;
   dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
   dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
 
-  makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }:
-    callPackage ../development/libraries/dbus/make-dbus-conf.nix {
-      inherit suidHelper serviceDirectories apparmor;
-    };
+  makeDBusConf = callPackage ../development/libraries/dbus/make-dbus-conf.nix { };
 
   dee = callPackage ../development/libraries/dee {
     autoreconfHook = buildPackages.autoreconfHook269;