Robert Schütz 2026-06-17 07:59:37 -07:00
commit 9c39764fac
2 changed files with 9 additions and 31 deletions

View file

@ -1,23 +0,0 @@
On nixpkgs /tmp/.X11-unix is not compatible with Xvfb requirement and the
test fails.
--- a/meson.build
+++ b/meson.build
@@ -1229,18 +1229,6 @@ if get_option('enable-x11')
env: test_env,
is_parallel : false,
)
- test(
- 'x11comp',
- executable(
- 'test-x11comp',
- 'test/x11comp.c',
- 'test/utils-text.c',
- 'test/utils-text.h',
- dependencies: x11_xvfb_test_dep
- ),
- env: test_env,
- is_parallel : false,
- )
endif
if get_option('enable-xkbregistry')
test(

View file

@ -11,6 +11,8 @@
libxcb,
libxml2,
python3,
setxkbmap,
xkbcomp,
libx11,
# To enable the "interactive-wayland" subcommand of xkbcli. This is the
# wayland equivalent of `xev` on X11.
@ -24,20 +26,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libxkbcommon";
version = "1.13.1";
version = "1.13.2";
src = fetchFromGitHub {
owner = "xkbcommon";
repo = "libxkbcommon";
tag = "xkbcommon-${finalAttrs.version}";
hash = "sha256-wUsxsM0xXTg7nbvFMXrrnHherOepj0YI77eferjRgJA=";
hash = "sha256-JdS4+HPHDUUOUq5TUX2F5DicHif8wD3cPvMocWhD4S4=";
};
patches = [
# Disable one Xvfb test as it fails for permission checks.
./disable-x11com.patch
];
outputs = [
"out"
"dev"
@ -64,7 +61,11 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-protocols
];
nativeCheckInputs = [ python3 ];
nativeCheckInputs = [
python3
setxkbmap
xkbcomp
];
mesonFlags = [
"-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb"