From bad3ccd099ebe9a8aa017bda8500ab02787d90aa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 16 Jun 2021 19:22:12 +0000 Subject: [PATCH] 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) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20daf163363..0e42d2e389d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };