Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5caa22fe0a90
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 70e8face4c21
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 28, 2018

  1. 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.
    @hedning @jtojnar
    hedning authored and jtojnar committed Mar 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    70e8fac View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/development/libraries/dbus/make-system-conf.xsl
1 change: 1 addition & 0 deletions pkgs/development/libraries/dbus/make-system-conf.xsl
View file
Original file line number Diff line number Diff line change
@@ -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>