diff options
| author | Janne Heß <janne@hess.ooo> | 2020-11-02 22:11:38 +0100 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2020-11-18 10:10:25 +0100 |
| commit | 060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06 (patch) | |
| tree | a3d720714a1e8913c5a17883e5c166c70d297127 /pkgs/development/libraries/dbus/make-dbus-conf.nix | |
| parent | e949d758998fafbef608adcf9f54d79a6e7da4c8 (diff) | |
| download | nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar.gz nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar.bz2 nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar.lz nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar.xz nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.tar.zst nixpkgs-060d20de2415fdb4a9b8d8be18dff4e7e4b7ca06.zip | |
dbus: Enable AppArmor mediation support
Diffstat (limited to 'pkgs/development/libraries/dbus/make-dbus-conf.nix')
| -rw-r--r-- | pkgs/development/libraries/dbus/make-dbus-conf.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index e714b96b7e9..ce5c0b3b577 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,6 +1,7 @@ { runCommand, writeText, libxslt, dbus , serviceDirectories ? [] , suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" +, apparmor ? "disabled" # one of enabled, disabled, required }: /* DBus has two configuration parsers -- normal and "trivial", which is used @@ -10,7 +11,7 @@ */ runCommand "dbus-1" { - inherit serviceDirectories suidHelper; + inherit serviceDirectories suidHelper apparmor; preferLocalBuild = true; allowSubstitutes = false; XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' @@ -33,10 +34,12 @@ runCommand "dbus-1" xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ --stringparam suidHelper "$suidHelper" \ + --stringparam apparmor "$apparmor" \ ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ > $out/system.conf xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ + --stringparam apparmor "$apparmor" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf '' |