JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #228094: xvfb-run: use a minimal xserver build

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-04-25 11:12:21 +02:00
commit 2abb1ddb41
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/top-level/all-packages.nix
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 { };