From 36176abdf37f3685680d6fff241d8a57780d8f83 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 30 Jul 2023 01:45:37 +0000
Subject: [PATCH] libwacom, pipewire: fix build/remove qt5 dep

---
 overlays/disable-flakey-tests.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/overlays/disable-flakey-tests.nix b/overlays/disable-flakey-tests.nix
index 63053acd..5522d401 100644
--- a/overlays/disable-flakey-tests.nix
+++ b/overlays/disable-flakey-tests.nix
@@ -10,7 +10,12 @@ let
     doCheck = false;
     doInstallCheck = false;
   });
-  dontCheckAarch64 = p: p.overrideAttrs (_: next.lib.optionalAttrs (p.stdenv.targetPlatform.system == "aarch64-linux") {
+  aarch64Only = f: p: p.overrideAttrs (upstream:
+    next.lib.optionalAttrs
+      (p.stdenv.targetPlatform.system == "aarch64-linux")
+      (f upstream)
+  );
+  dontCheckAarch64 = aarch64Only (_: {
     # only `dontCheck` if the package is being built for aarch64
     doCheck = false;
     doInstallCheck = false;
@@ -21,6 +26,19 @@ in {
   # it might be enough to only disable checks when targeting aarch64, which could reduce rebuilds?
   elfutils = dontCheckAarch64 prev.elfutils;
 
+  # 2023/07/28
+  # "7/7 libwacom:all / pytest                               TIMEOUT        30.36s   killed by signal 15 SIGTERM"
+  libwacom = aarch64Only (_: {
+    doCheck = false;
+    mesonFlags = [ "-Dtests=disabled" ];
+  }) prev.libwacom;
+
+  pipewire = prev.pipewire.override {
+    # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
+    # this means we lose firewire support (oh well..?)
+    ffadoSupport = false;
+  };
+
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
     (py-next: py-prev: {
       pyarrow = py-prev.pyarrow.overridePythonAttrs (upstream: {