lomiri.lomiri-clock-app: Add mesa.llvmpipeHook, re-allow affected tes…

…t(s)
NixOS · Dec 31, 2024 · 198305b · 198305b
1 parent 3609c77
commit 198305b
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
@@ -12,6 +12,7 @@
   lomiri-sounds,
   lomiri-ui-toolkit,
   makeWrapper,
+  mesa,
   pkg-config,
   qtbase,
   qtdeclarative,
@@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeCheckInputs = [
+    mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35
     qtdeclarative # qmltestrunner
     xvfb-run
   ];
@@ -87,20 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "CLICK_MODE" false)
     (lib.cmakeBool "INSTALL_TESTS" false)
     (lib.cmakeBool "USE_XVFB" true)
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
-      lib.concatStringsSep ";" [
-        # Exclude tests
-        "-E"
-        (lib.strings.escapeShellArg "(${
-          lib.concatStringsSep "|" [
-            # Runs into ShapeMaterial codepath in lomiri-ui-toolkit which needs OpenGL, see LUITK for details
-            "^AlarmLabel"
-            "^AlarmRepeat"
-            "^AlarmSound"
-          ]
-        })")
-      ]
-    ))
   ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;