diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-15 21:53:43 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-16 13:59:08 -0400 |
commit | 5548dd31f01c0824c9bfce395a0f12e9d0aaa76a (patch) | |
tree | e6ed8d7215eb0bef6b7985c0b46241363a2af247 | |
parent | 5067fb6562fd843ffee5ad904fb083b2848a6f63 (diff) | |
download | nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar.gz nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar.bz2 nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar.lz nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar.xz nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.tar.zst nixlib-5548dd31f01c0824c9bfce395a0f12e9d0aaa76a.zip |
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.
-rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index be43d23d6115..cca3674bdd1c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation rec { "--enable-library" "--enable-cups" "--enable-pie" - "--with-dbusconfdir=$(out)/etc" - "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" - "--with-dbussessionbusdir=$(out)/share/dbus-1/services" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemduserunitdir=$(out)/etc/systemd/user" - "--with-udevdir=$(out)/lib/udev" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-dbussystembusdir=${placeholder "out"}/share/dbus-1/system-services" + "--with-dbussessionbusdir=${placeholder "out"}/share/dbus-1/services" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" + "--with-udevdir=${placeholder "out"}/lib/udev" ] ++ optional enableWiimote [ "--enable-wiimote" ] ++ optional enableMidi [ "--enable-midi" ] ++ optional enableSixaxis [ "--enable-sixaxis" ]); @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # Work around `make install' trying to create /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 = '' mkdir -p $test/{bin,test} |