From 72b37462668e3a7568d94632994a9df5d7fd37eb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Feb 2017 15:37:20 +0300
Subject: dbus service: remove {system,session}.conf from config dir

They are already included by dbus from /run/current-system/sw/share/dbus-1.
---
 nixos/modules/services/system/dbus.nix | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'nixos/modules/services/system/dbus.nix')

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 6e050fd174e..aeb5bf9c7a3 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -27,14 +27,6 @@ let
     ''
       mkdir -p $out
 
-      cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out
-
-      # avoid circular includes
-      sed -ri 's@(<include ignore_missing="yes">/etc/dbus-1/(system|session)\.conf</include>)@<!-- \1 -->@g' $out/{system,session}.conf
-
-      # include by full path
-      sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
-
       sed '${./dbus-system-local.conf.in}' \
         -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
         -e 's,@extra@,${systemExtraxml},' \
-- 
cgit 1.4.1