diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-16 19:22:12 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-17 20:20:32 +0000 |
| commit | bad3ccd099ebe9a8aa017bda8500ab02787d90aa (patch) | |
| tree | 7c53aca8655adc296bf94bff20fe85724990dccb | |
| parent | Merge pull request #126553 from NixOS/backport-126422-to-release-21.05 (diff) | |
| download | nixpkgs-bad3ccd099ebe9a8aa017bda8500ab02787d90aa.tar.gz | |
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)
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20daf163363b..0e42d2e389dc 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; }; |