summary refs log tree commit diff
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2018-03-25 07:57:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-03-28 20:41:06 +0200
commit70e8face4c210d372d2b8085a00a70a5ce5c8c21 (patch)
tree006a9bb9f42c3d90ba219b47874cde9386429430
parent5caa22fe0a908ede1889d32fa773b9aef675a56e (diff)
downloadnixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar.gz
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar.bz2
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar.lz
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar.xz
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.tar.zst
nixpkgs-70e8face4c210d372d2b8085a00a70a5ce5c8c21.zip
makeDBusConf: Look for .conf files in share/dbus-1/system.d/ too
Some packages install their dbus config files to `share/dbus-1/system.d` instead
of `etc/dbus-1/system.d`, so look in both places.
-rw-r--r--pkgs/development/libraries/dbus/make-system-conf.xsl1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl
index 3d8b823437d..dd644b4bce7 100644
--- a/pkgs/development/libraries/dbus/make-system-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-system-conf.xsl
@@ -27,6 +27,7 @@
       <xsl:for-each select="str:tokenize($serviceDirectories)">
         <servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
         <includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
+        <includedir><xsl:value-of select="." />/share/dbus-1/system.d</includedir>
       </xsl:for-each>
     </busconfig>
   </xsl:template>