final: prev: {
	xorg = prev.xorg // {
		# Apply startx patch to create serverauth file in /tmp instead of home directory
		xinit = (prev.xorg.xinit.overrideAttrs (finalAttrs: previousAttrs: {
			version = "1.4.4";
			patchtag = "${finalAttrs.version}-1";  # Archlinux xinit package tagged release to fetch patch from
			# Override src since is hardcoded to 1.4.2
			src = prev.fetchurl {
				url = "mirror://xorg/individual/app/xinit-${finalAttrs.version}.tar.xz";
				sha256 = "sha256-QKR8ehZMf5gc43h7Szf35BH7QyMdzeVD1wCUB12s/vk=";
			};
			patches = [
				(prev.fetchpatch {
					url = "https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-xinit/-/raw/${finalAttrs.patchtag}/06_move_serverauthfile_into_tmp.diff";
					sha256 = "1whzs5bw7ph12r3abs1g9fydibkr291jh56a0zp17d4x070jnkda";
				})
			];
		}));
	};
}