mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge pull request #120064 from pennae/startx-dbus
xinit: don't unset DBUS_SESSION_BUS_ADDRESS in startx
This commit is contained in:
commit
eab5c73a13
@ -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 = ''
|
||||
|
Loading…
Reference in New Issue
Block a user