Skip to content

xorg.xvfb: restore GLX/DRI support #423961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K900 merged 1 commit into from
Jul 10, 2025
Merged

xorg.xvfb: restore GLX/DRI support #423961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,20 +1157,14 @@ self: super:
);

# xvfb is used by a bunch of things to run tests
# and doesn't support hardware accelerated rendering
# so remove it from the rebuild heavy path for mesa
# so try to reduce its reverse closure
xvfb = super.xorgserver.overrideAttrs (old: {
configureFlags =
[
"--enable-xvfb"
"--disable-xorg"
"--disable-xquartz"
"--disable-xwayland"
"--disable-glamor"
"--disable-glx"
"--disable-dri"
"--disable-dri2"
"--disable-dri3"
"--with-xkb-bin-directory=${xorg.xkbcomp}/bin"
"--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
"--with-xkb-output=$out/share/X11/xkb/compiled"
Expand All @@ -1180,10 +1174,15 @@ self: super:
];

buildInputs = old.buildInputs ++ [
dri-pkgconfig-stub
libdrm
libGL
mesa-gl-headers
xorg.pixman
xorg.libXfont2
xorg.xtrans
xorg.libxcvt
xorg.libxshmfence
];
});

Expand Down