xvfb-run: use a minimal xserver build

This should get us in the range of 500 rebuilds for Mesa,
which is easily mergeable into master. Hype.
This commit is contained in:
K900 2023-04-25 10:08:48 +03:00
parent d0ea36ece4
commit 5c0aa81909

View file

@ -13976,7 +13976,23 @@ with pkgs;
xxv = callPackage ../tools/misc/xxv { };
xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
xvfb-run = callPackage ../tools/misc/xvfb-run {
inherit (texFunctions) fontsConf;
# xvfb-run 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
xorgserver = xorg.xorgserver.overrideAttrs(old: {
buildInputs = lib.filter (pkg: lib.getName pkg != "mesa") old.buildInputs;
configureFlags = old.configureFlags ++ [
"--disable-glamor"
"--disable-glx"
"--disable-dri"
"--disable-dri2"
"--disable-dri3"
];
});
};
xvkbd = callPackage ../tools/X11/xvkbd { };