makeDBusConf: make apparmor argument optional

The only in-tree use of this is the DBus NixOS module, which always
passes apparmor (but the services.dbus.apparmor option defaults to
"disabled").  Set the default in the function as well so other users
of the function can take advantage of it.
This commit is contained in:
Alyssa Ross
2021-06-17 19:44:46 +00:00
parent 7c845e60cd
commit 59420d6b6f
+1 -1
View File
@@ -14720,7 +14720,7 @@ in
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 }:
makeDBusConf = { suidHelper, serviceDirectories, apparmor ? "disabled" }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
inherit suidHelper serviceDirectories apparmor;
};