bluez: 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.
This commit is contained in:
worldofpeace 2019-09-15 21:53:43 -04:00
parent 5067fb6562
commit 5548dd31f0

View file

@ -48,12 +48,12 @@ stdenv.mkDerivation rec {
"--enable-library" "--enable-library"
"--enable-cups" "--enable-cups"
"--enable-pie" "--enable-pie"
"--with-dbusconfdir=$(out)/etc" "--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbussystembusdir=$(out)/share/dbus-1/system-services" "--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services"
"--with-dbussessionbusdir=$(out)/share/dbus-1/services" "--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user" "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user"
"--with-udevdir=$(out)/lib/udev" "--with-udevdir=${placeholder "out"}/lib/udev"
] ++ optional enableWiimote [ "--enable-wiimote" ] ] ++ optional enableWiimote [ "--enable-wiimote" ]
++ optional enableMidi [ "--enable-midi" ] ++ optional enableMidi [ "--enable-midi" ]
++ optional enableSixaxis [ "--enable-sixaxis" ]); ++ optional enableSixaxis [ "--enable-sixaxis" ]);
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
# Work around `make install' trying to create /var/lib/bluetooth. # Work around `make install' trying to create /var/lib/bluetooth.
installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; makeFlags = "rulesdir=${placeholder "out"}/lib/udev/rules.d";
postInstall = '' postInstall = ''
mkdir -p $test/{bin,test} mkdir -p $test/{bin,test}