Merge pull request #120064 from pennae/startx-dbus

xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx
This commit is contained in:
Jörg Thalheim 2021-04-22 15:52:08 +01:00 committed by GitHub
commit eab5c73a13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 = ''