From 43b7c9611ca823741d702f6e00059185bb3e856e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 23 May 2022 17:54:01 +0200 Subject: [PATCH] Revert "xorg.xorgserver: 1.20.13 -> 21.1.3" This reverts commit 3312352596a2c5c6bf6775ee2f90c4eca0e39223. Fixes #170856: issues of some users. --- .../gnome/core/mutter/3.38/default.nix | 4 +--- pkgs/desktops/gnome/core/mutter/default.nix | 4 +--- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/overrides.nix | 20 ++++++++++++++++++- pkgs/servers/x11/xorg/tarballs.list | 2 +- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 799f80917268..3c2d30b813ba 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -32,7 +32,6 @@ , mesa , meson , gnome-settings-daemon -, libxcvt , xorgserver , python3 , wrapGAppsHook @@ -100,8 +99,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook - libxcvt - xorgserver + xorgserver # for cvt command ]; buildInputs = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 415fd7b80c94..205f0467b141 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -33,7 +33,6 @@ , mesa , meson , gnome-settings-daemon -, libxcvt , xorgserver , python3 , wrapGAppsHook @@ -96,8 +95,7 @@ let self = stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook - libxcvt - xorgserver + xorgserver # for cvt command ]; buildInputs = [ diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0b11138ec237..6628664363e5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3100,17 +3100,17 @@ lib.makeScope newScope (self: with self; { }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile }: stdenv.mkDerivation { + xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { pname = "xorg-server"; - version = "21.1.3"; + version = "1.20.13"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz"; - sha256 = "1rgbrld7spg7plkv3c3bbnlnszpflk5z1mqbjrmi2ymlnvasmmk1"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz"; + sha256 = "003371ad64bz7i2hx7idnh90yw12dbh116ssy40s70balnb4xaj0"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto openssl libX11 libXau libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile ]; + buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3b670f6b64e0..b9c2d9588830 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -653,7 +653,7 @@ self: super: in attrs // (let version = lib.getVersion attrs; - commonBuildInputs = attrs.buildInputs ++ [ libxcvt xtrans ]; + commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ zlib libGL libGLU dbus xorgproto @@ -686,10 +686,28 @@ self: super: then { outputs = [ "out" "dev" ]; patches = [ + # https://lists.x.org/archives/xorg-announce/2021-December/003122.html + (fpgit "ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60" + "sNi16FqN4rS4s8j5+PUVeOQBasccCkB5KvywP7xl28M=" "CVE-2021-4008") + (fpgit "b5196750099ae6ae582e1f46bd0a6dad29550e02" + "5hgzQXBBaJfhSTa9hs8K2N1fQ6+Vp8TTkertmQhkw8Y=" "CVE-2021-4009") + (fpgit "6c4c53010772e3cb4cb8acd54950c8eec9c00d21" + "1gGG9RpjLMi7Emwh13/z5CN1+ISLsPL3hJXP5gQcNkE=" "CVE-2021-4010") + (fpgit "e56f61c79fc3cee26d83cda0f84ae56d5979f768" + "e1KgSXGwwI3GgcYeWaF3KHPmkE4tf9VTqvfTYqRpysY=" "CVE-2021-4011") + # The build process tries to create the specified logdir when building. # # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch + + # Fix e.g. xorg.xf86videovmware with libdrm 2.4.108 + # TODO: remove with xorgserver >= 1.21 + (fetchpatch { + name = "stdbool.patch"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff"; + sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy"; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3a0cce1ee052..dbab8a4774f1 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-21.1.3.tar.xz +mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz