From 6e03f1b2c29848198f2ec62117085fb7f1bac995 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 23 Oct 2024 21:23:41 -0500
Subject: [PATCH 1/4] cava: format

---
 pkgs/applications/audio/cava/default.nix | 65 +++++++++++++-----------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index ed15a6df8808..71e51f103645 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -1,19 +1,20 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, autoconf-archive
-, alsa-lib
-, fftw
-, iniparser
-, libpulseaudio
-, pipewire
-, ncurses
-, pkgconf
-, SDL2
-, libGL
-, withSDL2 ? false
-, withPipewire ? true
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  autoconf-archive,
+  alsa-lib,
+  fftw,
+  iniparser,
+  libpulseaudio,
+  pipewire,
+  ncurses,
+  pkgconf,
+  SDL2,
+  libGL,
+  withSDL2 ? false,
+  withPipewire ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,18 +28,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss=";
   };
 
-  buildInputs = [
-    alsa-lib
-    fftw
-    libpulseaudio
-    ncurses
-    iniparser
-  ] ++ lib.optionals withSDL2 [
-    SDL2
-    libGL
-  ] ++ lib.optionals withPipewire [
-    pipewire
-  ];
+  buildInputs =
+    [
+      alsa-lib
+      fftw
+      libpulseaudio
+      ncurses
+      iniparser
+    ]
+    ++ lib.optionals withSDL2 [
+      SDL2
+      libGL
+    ]
+    ++ lib.optionals withPipewire [
+      pipewire
+    ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -54,7 +58,10 @@ stdenv.mkDerivation rec {
     description = "Console-based Audio Visualizer for Alsa";
     homepage = "https://github.com/karlstav/cava";
     license = licenses.mit;
-    maintainers = with maintainers; [ offline mirrexagon ];
+    maintainers = with maintainers; [
+      offline
+      mirrexagon
+    ];
     platforms = platforms.linux;
     mainProgram = "cava";
   };

From c52f659b78751e037c983e482985c72fd4ca0985 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 23 Oct 2024 21:43:08 -0500
Subject: [PATCH 2/4] cava: add darwin support

---
 pkgs/applications/audio/cava/default.nix | 30 +++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 71e51f103645..864db4fc62ac 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -7,14 +7,16 @@
   alsa-lib,
   fftw,
   iniparser,
-  libpulseaudio,
-  pipewire,
-  ncurses,
-  pkgconf,
-  SDL2,
   libGL,
+  libpulseaudio,
+  libtool,
+  ncurses,
+  pipewire,
+  pkgconf,
+  portaudio,
+  SDL2,
   withSDL2 ? false,
-  withPipewire ? true,
+  withPipewire ? stdenv.hostPlatform.isLinux,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,15 +32,21 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
-      alsa-lib
       fftw
-      libpulseaudio
-      ncurses
       iniparser
+      libpulseaudio
+      libtool
+      ncurses
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      portaudio
     ]
     ++ lib.optionals withSDL2 [
-      SDL2
       libGL
+      SDL2
     ]
     ++ lib.optionals withPipewire [
       pipewire
@@ -62,7 +70,7 @@ stdenv.mkDerivation rec {
       offline
       mirrexagon
     ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     mainProgram = "cava";
   };
 }

From 5279cea7a780133b349a3dd50ea4086578888c34 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 23 Oct 2024 21:59:18 -0500
Subject: [PATCH 3/4] cava: add versionCheckHook

---
 pkgs/applications/audio/cava/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 864db4fc62ac..7f09e13c9d17 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -15,6 +15,7 @@
   pkgconf,
   portaudio,
   SDL2,
+  versionCheckHook,
   withSDL2 ? false,
   withPipewire ? stdenv.hostPlatform.isLinux,
 }:
@@ -56,7 +57,10 @@ stdenv.mkDerivation rec {
     autoreconfHook
     autoconf-archive
     pkgconf
+    versionCheckHook
   ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-v";
 
   preAutoreconf = ''
     echo ${version} > version

From 1dfebceb6e98e46cd24052f71207d66bc2e3ed82 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 23 Oct 2024 22:10:34 -0500
Subject: [PATCH 4/4] cava: move to by-name

---
 .../audio/cava/default.nix => by-name/ca/cava/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/cava/default.nix => by-name/ca/cava/package.nix} (100%)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/by-name/ca/cava/package.nix
similarity index 100%
rename from pkgs/applications/audio/cava/default.nix
rename to pkgs/by-name/ca/cava/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b68d1d177ca..76d7a62e6b8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28400,8 +28400,6 @@ with pkgs;
 
   catt = callPackage ../applications/video/catt { };
 
-  cava = callPackage ../applications/audio/cava { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };