diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix deleted file mode 100644 index ed15a6df8808..000000000000 --- a/pkgs/applications/audio/cava/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, autoconf-archive -, alsa-lib -, fftw -, iniparser -, libpulseaudio -, pipewire -, ncurses -, pkgconf -, SDL2 -, libGL -, withSDL2 ? false -, withPipewire ? true -}: - -stdenv.mkDerivation rec { - pname = "cava"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "karlstav"; - repo = "cava"; - rev = version; - hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss="; - }; - - buildInputs = [ - alsa-lib - fftw - libpulseaudio - ncurses - iniparser - ] ++ lib.optionals withSDL2 [ - SDL2 - libGL - ] ++ lib.optionals withPipewire [ - pipewire - ]; - - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkgconf - ]; - - preAutoreconf = '' - echo ${version} > version - ''; - - meta = with lib; { - description = "Console-based Audio Visualizer for Alsa"; - homepage = "https://github.com/karlstav/cava"; - license = licenses.mit; - maintainers = with maintainers; [ offline mirrexagon ]; - platforms = platforms.linux; - mainProgram = "cava"; - }; -} diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix new file mode 100644 index 000000000000..7f09e13c9d17 --- /dev/null +++ b/pkgs/by-name/ca/cava/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + autoconf-archive, + alsa-lib, + fftw, + iniparser, + libGL, + libpulseaudio, + libtool, + ncurses, + pipewire, + pkgconf, + portaudio, + SDL2, + versionCheckHook, + withSDL2 ? false, + withPipewire ? stdenv.hostPlatform.isLinux, +}: + +stdenv.mkDerivation rec { + pname = "cava"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "karlstav"; + repo = "cava"; + rev = version; + hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss="; + }; + + buildInputs = + [ + fftw + iniparser + libpulseaudio + libtool + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + portaudio + ] + ++ lib.optionals withSDL2 [ + libGL + SDL2 + ] + ++ lib.optionals withPipewire [ + pipewire + ]; + + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkgconf + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "-v"; + + preAutoreconf = '' + echo ${version} > version + ''; + + meta = with lib; { + description = "Console-based Audio Visualizer for Alsa"; + homepage = "https://github.com/karlstav/cava"; + license = licenses.mit; + maintainers = with maintainers; [ + offline + mirrexagon + ]; + platforms = platforms.unix; + mainProgram = "cava"; + }; +} 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 { };