about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 22:41:02 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:09 -0400
commit22ad487a1f0b82a644959dc3a1db5a2db36e2a9d (patch)
tree9e56d3fee6459a687b6616aabb25b2939afd9394 /pkgs
parent061ea7d1ccc759344d8931469e02092ae6360f52 (diff)
downloadnixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar.gz
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar.bz2
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar.lz
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar.xz
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.tar.zst
nixlib-22ad487a1f0b82a644959dc3a1db5a2db36e2a9d.zip
thermald: 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')
-rw-r--r--pkgs/tools/system/thermald/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 3429419052fe..8caff1170bcf 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--sysconfdir=$(out)/etc" "--localstatedir=/var"
-    "--with-dbus-sys-dir=$(out)/etc/dbus-1/system.d"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--localstatedir=/var"
+    "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
+    "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
     ];
 
   meta = with stdenv.lib; {