From 6874424765fcb9330dabe573b04e65c09c212a3b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 2 Jul 2023 12:54:50 +0800 Subject: [PATCH] xorg.xinit: drop upstreamed patch --- pkgs/servers/x11/xorg/overrides.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ecf4508e5829..08eb42d0cb33 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -855,14 +855,6 @@ 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://raw.githubusercontent.com/archlinux/svntogit-packages/40f3ac0a31336d871c76065270d3f10e922d06f3/trunk/fs46369.patch"; - sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; - }) - ]; postPatch = '' # Avoid replacement of word-looking cpp's builtin macros in Nix's cross-compiled paths substituteInPlace Makefile.in --replace "PROGCPPDEFS =" "PROGCPPDEFS = -Dlinux=linux -Dunix=unix"