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. (cherry picked from commit e9f45cc69d6fb2a2e2446ce9606eb7e9c376959f)
This commit is contained in:
parent
246502ae2d
commit
bad3ccd099
@ -14521,7 +14521,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;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user