From 59420d6b6ff407b96123e9c8c2a6f2ebeb1eba10 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. --- 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 261ce112611f..7bc9f0d036b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };