diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-18 08:59:29 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-18 08:59:29 +0100 |
commit | 432dba859e45f10df826bb9e0f09e0a1bf847d2e (patch) | |
tree | bcd95022c7ad759cc4919db6044c9c1059df1d16 /nixos/modules | |
parent | 170039ace5cc74a04c41aacbbd82613c0e1481b2 (diff) | |
parent | 714eabc5af342f81fc36481486b4b388ebefb8c7 (diff) | |
download | nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar.gz nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar.bz2 nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar.lz nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar.xz nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.tar.zst nixlib-432dba859e45f10df826bb9e0f09e0a1bf847d2e.zip |
Merge branch 'staging'
A security update of libxml2 is within.
Diffstat (limited to 'nixos/modules')
-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 |