diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-01 15:37:20 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-01 15:37:24 +0300 |
| commit | 72b37462668e3a7568d94632994a9df5d7fd37eb (patch) | |
| tree | c5d87317da1a5526be2b215a3874afcb1bedcff4 /nixos/modules/services/system/dbus.nix | |
| parent | 39344a36d318553001f9d738732c9785e8ce054b (diff) | |
| download | nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar.gz nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar.bz2 nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar.lz nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar.xz nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.tar.zst nixpkgs-72b37462668e3a7568d94632994a9df5d7fd37eb.zip | |
dbus service: remove {system,session}.conf from config dir
They are already included by dbus from /run/current-system/sw/share/dbus-1.
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 8 |
1 files changed, 0 insertions, 8 deletions
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},' \ |