diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-15 22:27:04 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-16 13:59:08 -0400 |
| commit | 061ea7d1ccc759344d8931469e02092ae6360f52 (patch) | |
| tree | 42562d394316dd0ff56b9fe5acde278fedda5ca8 /pkgs/misc/cups/default.nix | |
| parent | bdb0ea879a5c9440024e559d36c4d97ce4227c6c (diff) | |
| download | nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar.gz nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar.bz2 nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar.lz nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar.xz nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.tar.zst nixlib-061ea7d1ccc759344d8931469e02092ae6360f52.zip | |
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.
Diffstat (limited to 'pkgs/misc/cups/default.nix')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6e27fdb0a524..c7df3f333b65 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ "--enable-dbus" "--enable-pam" + "--with-dbusdir=${placeholder "out"}/share/dbus-1" ] ++ optional (libusb != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" @@ -81,7 +82,6 @@ stdenv.mkDerivation rec { "STATEDIR=$(TMPDIR)/dummy" # Idem for /etc. "PAMDIR=$(out)/etc/pam.d" - "DBUSDIR=$(out)/etc/dbus-1" "XINETD=$(out)/etc/xinetd.d" "SERVERROOT=$(out)/etc/cups" # Idem for /usr. |