Skip to content

Commit

Permalink
makeDBusConf: make apparmor argument optional
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
alyssais committed Jun 16, 2021
1 parent d850550 commit e9f45cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit e9f45cc

Please sign in to comment.