diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-04-22 18:14:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 18:14:27 +0000 |
| commit | b95da5efb635ea7be33ad454bde8a279b772853d (patch) | |
| tree | dc5d747d5b42dc7783f7dc4fc66d707c549cb142 /pkgs/servers/x11 | |
| parent | de5555d8e9cb1d60888c60a3d7261d74ded47a8d (diff) | |
| parent | bdf8e0fc31b6764149e30006c4fc56af9920d222 (diff) | |
| download | nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar.gz nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar.bz2 nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar.lz nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar.xz nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.tar.zst nixpkgs-b95da5efb635ea7be33ad454bde8a279b772853d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3f88c0e0c99..6ab9f8ed8dd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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 = '' |