From b3c5b94b4cb7ce68a7bfdbf4d595f9e153e76902 Mon Sep 17 00:00:00 2001 From: Matthew_Cash Date: Sat, 15 Jun 2024 16:30:08 -0700 Subject: [PATCH 1/6] xwayland: cherry-pick patch to fix segfault when linux-dmabuf device is not accessible Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 --- pkgs/servers/x11/xorg/xwayland.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index edf53c8e4579f..0b2329cd4396e 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -64,6 +64,13 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch"; hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ="; }) + # Backport fix for segfault when linux-dmabuf device is not accessible + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch"; + hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI="; + }) ]; depsBuildBuild = [ From 5ef5faae53f87a792d4511fa3277cb52af00b601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:12:08 -0400 Subject: [PATCH 2/6] xwayland: fix impure dependency on /bin/sh --- pkgs/servers/x11/xorg/xwayland.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 0b2329cd4396e..1dc76bdb950b1 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,5 @@ { egl-wayland +, bash , libepoxy , fetchurl , fetchpatch @@ -73,6 +74,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace os/utils.c \ + --replace-fail '/bin/sh' '${lib.getExe' bash "sh"}' + ''; + depsBuildBuild = [ pkg-config ]; From 426794aec32de90dfe09c124f35bb35533b492bf Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 11 Jul 2024 18:57:26 +0300 Subject: [PATCH 3/6] xwayland: 24.1.0 -> 24.1.1 --- pkgs/servers/x11/xorg/xwayland.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 1dc76bdb950b1..4a39727ad50bf 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -2,7 +2,6 @@ , bash , libepoxy , fetchurl -, fetchpatch , fontutil , lib , libdecor @@ -50,30 +49,13 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.0"; + version = "24.1.1"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI="; + hash = "sha256-cSW+4LEDNYBdf1ulffqjWaeFCvGmhSTx2Xs2J0GlGDI="; }; - patches = [ - # Backport fix for pkg-config generation to make CMake happy - # FIXME: remove when merged - # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch"; - hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ="; - }) - # Backport fix for segfault when linux-dmabuf device is not accessible - # FIXME: remove when merged - # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch"; - hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI="; - }) - ]; - postPatch = '' substituteInPlace os/utils.c \ --replace-fail '/bin/sh' '${lib.getExe' bash "sh"}' From aa9d36e7780b50fac2257819273769a16157058a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 7 Aug 2024 21:55:28 +0100 Subject: [PATCH 4/6] xwayland: 24.1.1 -> 24.1.2 Changes: https://lists.x.org/archives/xorg/2024-August/061710.html --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 4a39727ad50bf..c3dd528e7acfc 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.1"; + version = "24.1.2"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-cSW+4LEDNYBdf1ulffqjWaeFCvGmhSTx2Xs2J0GlGDI="; + hash = "sha256-FB63bn5CKjZhwIeCxwvkCTEIR1UELARQbg2X3UY+99I="; }; postPatch = '' From 28fe3d044ab2b16705a1404723a08e2dc66e9060 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 3 Oct 2024 06:42:59 +0100 Subject: [PATCH 5/6] xwayland: 24.1.2 -> 24.1.3 Changes: https://lists.x.org/archives/xorg/2024-October/061730.html --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index c3dd528e7acfc..cb60382648760 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-FB63bn5CKjZhwIeCxwvkCTEIR1UELARQbg2X3UY+99I="; + hash = "sha256-3NtXpmzJsSTI+TZ2BZJiisTnRKfXsxeaqGGJrX6kyxA="; }; postPatch = '' From f9fbea3cd1c6a8af0f885769631c59ff184e2f66 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 30 Oct 2024 06:23:28 +0000 Subject: [PATCH 6/6] xwayland: 24.1.3 -> 24.1.4 Changes: https://lists.x.org/archives/xorg-announce/2024-October/003545.html --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index cb60382648760..ed545e1f5684b 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "24.1.3"; + version = "24.1.4"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-3NtXpmzJsSTI+TZ2BZJiisTnRKfXsxeaqGGJrX6kyxA="; + hash = "sha256-2Wp426uBn1V1AXNERESZW1Ax69zBW3ev672NvAKvNPQ="; }; postPatch = ''