about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 22:20:43 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:08 -0400
commitbdb0ea879a5c9440024e559d36c4d97ce4227c6c (patch)
treedfc8c93e808900a140b393a03271c9501d3c9413
parenta2757ecdf264e5f0a65e7c1950b95779f104c84b (diff)
downloadnixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar.gz
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar.bz2
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar.lz
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar.xz
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.tar.zst
nixlib-bdb0ea879a5c9440024e559d36c4d97ce4227c6c.zip
flatpak: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
-rw-r--r--pkgs/development/libraries/flatpak/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index d29be4cb9304..8aa61949e401 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
     "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
+    "--dbus_config_dir=${placeholder "out"}/share/dbus-1/system.d"
     "--localstatedir=/var"
     "--enable-installed-tests"
   ];