From 7861ba5c512547c68f59811368ab71c72f5f7213 Mon Sep 17 00:00:00 2001
From: Aram Markarov <a.markarov@proton.me>
Date: Wed, 25 Feb 2026 19:14:58 +0100
Subject: [PATCH] cava reintroduced : uses libcava or cava for nix : needs
 nixos fixing, but could be isolated issue

---
 Plugins/ZShell/CMakeLists.txt          | 8 ++++----
 Plugins/ZShell/Services/CMakeLists.txt | 4 ++--
 nix/default.nix                        | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Plugins/ZShell/CMakeLists.txt b/Plugins/ZShell/CMakeLists.txt
index 9068c5e..bde2f00 100644
--- a/Plugins/ZShell/CMakeLists.txt
+++ b/Plugins/ZShell/CMakeLists.txt
@@ -3,10 +3,10 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
 pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
 pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)
-# pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
-# if(NOT Cava_FOUND)
-#     pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
-# endif()
+pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
+if(NOT Cava_FOUND)
+    pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
+endif()
 
 set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
 qt_standard_project_setup(REQUIRES 6.9)
diff --git a/Plugins/ZShell/Services/CMakeLists.txt b/Plugins/ZShell/Services/CMakeLists.txt
index 1bbfd4d..39ecda2 100644
--- a/Plugins/ZShell/Services/CMakeLists.txt
+++ b/Plugins/ZShell/Services/CMakeLists.txt
@@ -6,9 +6,9 @@ qml_module(ZShell-services
         beattracker.hpp beattracker.cpp
         audiocollector.hpp audiocollector.cpp
         audioprovider.hpp audioprovider.cpp
-        # cavaprovider.hpp cavaprovider.cpp
+        cavaprovider.hpp cavaprovider.cpp
     LIBRARIES
         PkgConfig::Pipewire
         PkgConfig::Aubio
-        # PkgConfig::Cava
+        PkgConfig::Cava
 )
diff --git a/nix/default.nix b/nix/default.nix
index 15f4d8d..514d346 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,4 +1,6 @@
 {
+  fftw,
+  libcava,
   rev,
   lib,
   stdenv,
@@ -74,6 +76,8 @@
       libqalculate
       pipewire
       aubio
+      libcava
+      fftw
     ];
 
     dontWrapQtApps = true;