Commit fc0a5b57 authored by pennae's avatar pennae
Browse files

xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx 

upstream startx unsets DBUS_SESSION_BUS_ADDRESS, which in turn breaks
applications run under the startx display manager. arch has shipped this
patch for years as well.

(with review changes from @Mic92)
parent 842f900e

pkgs/servers/x11/xorg/overrides.nix

+8 −0
Original line number Diff line number Diff line
@@ -773,6 +773,14 @@ self: super: 
      "--with-launchdaemons-dir=\${out}/LaunchDaemons"

      "--with-launchagents-dir=\${out}/LaunchAgents"

    ];

    patches = [

      # don't unset DBUS_SESSION_BUS_ADDRESS in startx

      (fetchpatch {

        name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch";

        url = "https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/fs46369.patch?h=packages/xorg-xinit&id=40f3ac0a31336d871c76065270d3f10e922d06f3";

        sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7";

      })

    ];

    propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ]

                         ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ];

    postFixup = ''