cups: 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:
parent
bdb0ea879a
commit
061ea7d1cc
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
||||||
] ++ optionals stdenv.isLinux [
|
] ++ optionals stdenv.isLinux [
|
||||||
"--enable-dbus"
|
"--enable-dbus"
|
||||||
"--enable-pam"
|
"--enable-pam"
|
||||||
|
"--with-dbusdir=${placeholder "out"}/share/dbus-1"
|
||||||
] ++ optional (libusb != null) "--enable-libusb"
|
] ++ optional (libusb != null) "--enable-libusb"
|
||||||
++ optional (gnutls != null) "--enable-ssl"
|
++ optional (gnutls != null) "--enable-ssl"
|
||||||
++ optional (avahi != null) "--enable-avahi"
|
++ optional (avahi != null) "--enable-avahi"
|
||||||
|
@ -81,7 +82,6 @@ stdenv.mkDerivation rec {
|
||||||
"STATEDIR=$(TMPDIR)/dummy"
|
"STATEDIR=$(TMPDIR)/dummy"
|
||||||
# Idem for /etc.
|
# Idem for /etc.
|
||||||
"PAMDIR=$(out)/etc/pam.d"
|
"PAMDIR=$(out)/etc/pam.d"
|
||||||
"DBUSDIR=$(out)/etc/dbus-1"
|
|
||||||
"XINETD=$(out)/etc/xinetd.d"
|
"XINETD=$(out)/etc/xinetd.d"
|
||||||
"SERVERROOT=$(out)/etc/cups"
|
"SERVERROOT=$(out)/etc/cups"
|
||||||
# Idem for /usr.
|
# Idem for /usr.
|
||||||
|
|
Loading…
Reference in a new issue