Run graphical tests through wayland-headless
This commit is contained in:
parent
8e3f467b3a
commit
4ae99ede0b
1 changed files with 4 additions and 14 deletions
|
@ -1,6 +1,7 @@
|
||||||
{ nixpkgs, ... }: final: prev:
|
{ self, nixpkgs, ... }: final: prev:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
inherit (final) system;
|
||||||
inherit (nixpkgs.lib.attrsets) genAttrs;
|
inherit (nixpkgs.lib.attrsets) genAttrs;
|
||||||
inherit (nixpkgs.lib.lists) remove toList;
|
inherit (nixpkgs.lib.lists) remove toList;
|
||||||
inherit (nixpkgs.lib.strings) mesonBool mesonEnable;
|
inherit (nixpkgs.lib.strings) mesonBool mesonEnable;
|
||||||
|
@ -33,6 +34,8 @@ in genAttrs [
|
||||||
] (pkg: prev.${pkg}.override { enableXWayland = false; })
|
] (pkg: prev.${pkg}.override { enableXWayland = false; })
|
||||||
|
|
||||||
// {
|
// {
|
||||||
|
xvfb-run = self.packages.${system}.wayland-headless;
|
||||||
|
|
||||||
beam = prev.beam_nox;
|
beam = prev.beam_nox;
|
||||||
graphviz = prev.graphviz-nox;
|
graphviz = prev.graphviz-nox;
|
||||||
|
|
||||||
|
@ -42,11 +45,6 @@ in genAttrs [
|
||||||
|
|
||||||
gd = prev.gd.override { withXorg = false; };
|
gd = prev.gd.override { withXorg = false; };
|
||||||
|
|
||||||
gjs = prev.gjs.overrideAttrs (prevAttrs: {
|
|
||||||
mesonFlags = prevAttrs.mesonFlags or [ ]
|
|
||||||
++ [ (mesonBool "skip_gtk_tests" true) ];
|
|
||||||
});
|
|
||||||
|
|
||||||
gst_all_1 = prev.gst_all_1 // genAttrs [
|
gst_all_1 = prev.gst_all_1 // genAttrs [
|
||||||
"gst-plugins-base"
|
"gst-plugins-base"
|
||||||
"gst-plugins-good"
|
"gst-plugins-good"
|
||||||
|
@ -85,14 +83,6 @@ in genAttrs [
|
||||||
++ [ (mesonBool "tests" false) ];
|
++ [ (mesonBool "tests" false) ];
|
||||||
});
|
});
|
||||||
|
|
||||||
libshumate = prev.libshumate.overrideAttrs (prevAttrs: {
|
|
||||||
postPatch = prevAttrs.postPatch or "" + ''
|
|
||||||
sed -E -i \
|
|
||||||
"/^[[:space:]]*'(map|marker(-layer)?)':/d" \
|
|
||||||
tests/meson.build
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
mesa = (prev.mesa.overrideAttrs (prevAttrs: {
|
mesa = (prev.mesa.overrideAttrs (prevAttrs: {
|
||||||
mesonFlags = prevAttrs.mesonFlags or [ ] ++ [
|
mesonFlags = prevAttrs.mesonFlags or [ ] ++ [
|
||||||
(mesonEnable "xlib-lease" false)
|
(mesonEnable "xlib-lease" false)
|
||||||
|
|
Loading…
Reference in a new issue