Hmm, why is there ./systemd.patch?

Hmm, why is there ./systemd.patch?

Noticed that too, I don't see any references to it outside dbus. I think we can remove it.

1. Should not this be /etc.

   --- /nix/store/l4rvh7fp92ljip1924sb8ggyng13d55l-dbus-1.12.16/etc/dbus-1/session.conf
   +++ /nix/store/5aajva4nk6scppj33d8ksrm6azxpccxs-dbus-1.12.16/etc/dbus-1/session.conf
   @@ -3,7 +3,7 @@
    
    In older versions of dbus, this file defined the behaviour of the well-known
    session bus. That behaviour is now determined by
   -/etc/dbus-1/session.conf, which should not be edited.
   +/nix/store/5aajva4nk6scppj33d8ksrm6azxpccxs-dbus-1.12.16/share/dbus-1/session.conf, which should not be edited.
    
    For local configuration changes, create a file
    session-local.conf or files matching session.d/*.conf in the same directory
   @@ -12,7 +12,7 @@
    
    For upstream or distribution-wide defaults that can be overridden
    by a local sysadmin, create files matching
   -/etc/dbus-1/session.d/*.conf instead.
   +/nix/store/5aajva4nk6scppj33d8ksrm6azxpccxs-dbus-1.12.16/share/dbus-1/session.d/*.conf instead.
    -->
    <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
     "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">

   (source)

   Edit: We are dropping the include in the stylesheet. Perhaps we should remove it in postInstall. ✔️

2. Hmm, I do not know how it could work before (perhaps it was replaced somewhere) but for setuid, the store path will not work:

   --- /nix/store/l4rvh7fp92ljip1924sb8ggyng13d55l-dbus-1.12.16/share/dbus-1/system.conf
   +++ /nix/store/5aajva4nk6scppj33d8ksrm6azxpccxs-dbus-1.12.16/share/dbus-1/system.conf
   @@ -24,7 +24,7 @@
      <standard_system_servicedirs/>
    
      <!-- This is a setuid helper that is used to launch system services -->
   +  <servicehelper>/libexec/dbus-daemon-launch-helper</servicehelper>
   *  <servicehelper>/nix/store/5aajva4nk6scppj33d8ksrm6azxpccxs-dbus-1.12.16/libexec/dbus-daemon-launch-helper</servicehelper>
    
      <!-- Write a pid file -->
      <pidfile>/run/dbus/pid</pidfile>
   

   (source)

   Edit: we are replacing the value in the stylesheet. ✔️

3. This looks good

   --- /nix/store/95wb8nr32bhi2fnfpj3qpspv8j0y2l54-dbus-1.12.16-dev/lib/pkgconfig/dbus-1.pc
   +++ /nix/store/kvrkj9icq3pgj969lmw2dkd7kjyvvly5-dbus-1.12.16-dev/lib/pkgconfig/dbus-1.pc
   @@ -7,7 +7,7 @@
    system_bus_default_address=unix:path=/run/dbus/system_bus_socket
    datarootdir=${prefix}/share
   -datadir=/etc
   +datadir=${datarootdir}
    sysconfdir=/etc
    session_bus_services_dir=${datadir}/dbus-1/services
    system_bus_services_dir=${datadir}/dbus-1/system-services

   ✔️

4. The share/dbus-1/*.d paths ought to be added to docs:

   nixpkgs/nixos/modules/services/system/dbus.nix

   Lines 46 to 49 in 9730ab8

   	<filename><replaceable>pkg</replaceable>/etc/dbus-1/system.d</filename>
   	<filename><replaceable>pkg</replaceable>/share/dbus-1/system-services</filename>
   	<filename><replaceable>pkg</replaceable>/etc/dbus-1/session.d</filename>
   	<filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename>

5. share/dbus-1/session.d path should be added here:

   nixpkgs/pkgs/development/libraries/dbus/make-session-conf.xsl

   Line 26 in 9730ab8

   <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir>

I think I responded to your comments correctly @jtojnar.

Changes look good from here.

Not sure how to test it, as it rebuilds everything.

Aside from a rebuild, you could test with https://github.com/worldofpeace/nixpkgs/commits/test-dbus.