diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-16 14:56:45 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-16 15:41:23 +0300 |
| commit | ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd (patch) | |
| tree | fb4a17b8be9fad9f89f6880b49827767dc55a877 /nixos/modules/services/system/dbus.nix | |
| parent | 3e23ec44503df219b8a705357eafd1f3960f34d9 (diff) | |
| download | nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar.gz nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar.bz2 nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar.lz nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar.xz nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.tar.zst nixpkgs-ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.zip | |
dbus service: use makeDBusConf
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 33bc890a78c..643bec18814 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -10,32 +10,10 @@ let homeDir = "/run/dbus"; - systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [ - "<servicedir>${d}/share/dbus-1/system-services</servicedir>" - "<includedir>${d}/etc/dbus-1/system.d</includedir>" - ])); - - sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [ - "<servicedir>${d}/share/dbus-1/services</servicedir>" - "<includedir>${d}/etc/dbus-1/session.d</includedir>" - ])); - - configDir = pkgs.runCommand "dbus-conf" - { preferLocalBuild = true; - allowSubstitutes = false; - } - '' - mkdir -p $out - - sed '${./dbus-system-local.conf.in}' \ - -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ - -e 's,@extra@,${systemExtraxml},' \ - > "$out/system-local.conf" - - sed '${./dbus-session-local.conf.in}' \ - -e 's,@extra@,${sessionExtraxml},' \ - > "$out/session-local.conf" - ''; + configDir = pkgs.makeDBusConf { + suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper"; + serviceDirectories = cfg.packages; + }; in |