diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-02-17 11:47:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-17 11:47:51 +0300 |
commit | 8ecd5c4019771802b035f7cbe515331c3a3e113f (patch) | |
tree | cfa9315887de135ad1eaba277b9eee0e5ebc1184 /nixos/modules/services | |
parent | 101d90d18b338a73541d5ddaac0c35b5ad57a9d8 (diff) | |
parent | ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd (diff) | |
download | nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar.gz nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar.bz2 nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar.lz nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar.xz nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.tar.zst nixlib-8ecd5c4019771802b035f7cbe515331c3a3e113f.zip |
Merge pull request #22864 from abbradar/dbus-etc
Redo DBus configuration
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/system/dbus-session-local.conf.in | 5 | ||||
-rw-r--r-- | nixos/modules/services/system/dbus-system-local.conf.in | 6 | ||||
-rw-r--r-- | nixos/modules/services/system/dbus.nix | 30 |
3 files changed, 4 insertions, 37 deletions
diff --git a/nixos/modules/services/system/dbus-session-local.conf.in b/nixos/modules/services/system/dbus-session-local.conf.in deleted file mode 100644 index 5fd6f80a3539..000000000000 --- a/nixos/modules/services/system/dbus-session-local.conf.in +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - @extra@ -</busconfig> diff --git a/nixos/modules/services/system/dbus-system-local.conf.in b/nixos/modules/services/system/dbus-system-local.conf.in deleted file mode 100644 index edbb476f585a..000000000000 --- a/nixos/modules/services/system/dbus-system-local.conf.in +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - <servicehelper>@servicehelper@</servicehelper> - @extra@ -</busconfig> diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 33bc890a78c8..643bec188142 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 |