From 3609c77cec51db4d34b01f6edfa33bad0886e619 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 30 Dec 2024 21:46:49 +0100
Subject: [PATCH] lomiri.lomiri-system-settings-unwrapped: Add
 mesa.llvmpipeHook, re-allow affected test(s)

---
 .../lomiri-system-settings/default.nix            | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 6085f4d1b5fb..7b29df587707 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -29,6 +29,7 @@
   lomiri-settings-components,
   lomiri-ui-toolkit,
   maliit-keyboard,
+  mesa,
   pkg-config,
   polkit,
   python3,
@@ -136,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     dbus
+    mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35
     (python3.withPackages (ps: with ps; [ python-dbusmock ]))
     xvfb-run
   ];
@@ -151,19 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true)
     (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (
-      lib.concatStringsSep ";" [
-        # Exclude tests
-        "-E"
-        (lib.strings.escapeShellArg "(${
-          lib.concatStringsSep "|" [
-            # Hits OpenGL context issue inside lomiri-ui-toolkit, see derivation of that on details
-            "^testmouse"
-            "^tst_notifications"
-          ]
-        })")
-      ]
-    ))
   ];
 
   # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be