diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-05 00:38:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 00:38:01 +0000 |
| commit | 4763e8b8fd805f63a707257b3c0bd6a1af90d7d8 (patch) | |
| tree | 6af77cd9c5d31ee5fb58281c11690b5e43032e07 /pkgs/servers/x11 | |
| parent | cb36dd7449c2cd8ed0d9c9946a3ffe0460a742b1 (diff) | |
| parent | 0cc6e0a4106f3fc1cc0b765ab0f17b697c3d910d (diff) | |
| download | nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar.gz nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar.bz2 nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar.lz nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar.xz nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.tar.zst nixlib-4763e8b8fd805f63a707257b3c0bd6a1af90d7d8.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
3 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6f8761641d2e..27a2b47387ff 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.9"; + name = "xorg-server-1.20.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2"; - sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2"; + sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c9d48c9de9f1..02dfb7ee1f55 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -630,16 +630,6 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release - preConfigure = let - # https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 - headerFix = fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch"; - sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq"; - }; - in '' - patch -p1 < ${headerFix} - ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index e0dff3e7748a..d4773075a251 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.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2 |