From a6d9f8ac19c5e4d9aeefa67a43c6f147d3aab575 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Wed, 6 Nov 2024 18:10:28 +0800
Subject: [PATCH] cantata: move to by-name

---
 .../cantata/dont-check-for-perl-in-PATH.diff    |  0
 .../ca/cantata/package.nix}                     | 17 +++++++----------
 pkgs/top-level/all-packages.nix                 |  2 --
 3 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio => by-name/ca}/cantata/dont-check-for-perl-in-PATH.diff (100%)
 rename pkgs/{applications/audio/cantata/default.nix => by-name/ca/cantata/package.nix} (95%)

diff --git a/pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff b/pkgs/by-name/ca/cantata/dont-check-for-perl-in-PATH.diff
similarity index 100%
rename from pkgs/applications/audio/cantata/dont-check-for-perl-in-PATH.diff
rename to pkgs/by-name/ca/cantata/dont-check-for-perl-in-PATH.diff
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/by-name/ca/cantata/package.nix
similarity index 95%
rename from pkgs/applications/audio/cantata/default.nix
rename to pkgs/by-name/ca/cantata/package.nix
index a9ce19cfdb81..27acc7d2a5cb 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -1,11 +1,9 @@
-{ mkDerivation
+{ stdenv
 , lib
 , fetchFromGitHub
 , cmake
 , pkg-config
-, qtbase
-, qtsvg
-, qttools
+, qt6
 , perl
 
   # Cantata doesn't build with cdparanoia enabled so we disable that
@@ -23,7 +21,6 @@
 , taglib
 , taglib_extras
 , withHttpStream ? true
-, qtmultimedia
 , withReplaygain ? true
 , ffmpeg
 , speex
@@ -64,7 +61,7 @@ let
     { names = [ "FFMPEG" "MPG123" "SPEEXDSP" ]; enable = withReplaygain; pkgs = [ ffmpeg speex mpg123 ]; }
     { names = [ "HTTPS_SUPPORT" ]; enable = true; pkgs = [ ]; }
     { names = [ "HTTP_SERVER" ]; enable = withHttpServer; pkgs = [ ]; }
-    { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qtmultimedia ]; }
+    { names = [ "HTTP_STREAM_PLAYBACK" ]; enable = withHttpStream; pkgs = [ qt6.qtmultimedia ]; }
     { names = [ "LAME" ]; enable = withLame; pkgs = [ lame ]; }
     { names = [ "LIBVLC" ]; enable = withLibVlc; pkgs = [ libvlc ]; }
     { names = [ "MTP" ]; enable = withMtp; pkgs = [ libmtp ]; }
@@ -76,7 +73,7 @@ let
   ];
 
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cantata";
   version = "2.5.0";
 
@@ -99,13 +96,13 @@ mkDerivation rec {
   '';
 
   buildInputs = [
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
     (perl.withPackages (ppkgs: with ppkgs; [ URI ]))
   ]
   ++ lib.flatten (builtins.catAttrs "pkgs" (builtins.filter (e: e.enable) options));
 
-  nativeBuildInputs = [ cmake pkg-config qttools ];
+  nativeBuildInputs = [ cmake pkg-config qt6.qttools ];
 
   cmakeFlags = lib.flatten (map (e: map (f: fstat e.enable f) e.names) options);
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f32f5a321df0..1caa45594e8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6119,8 +6119,6 @@ with pkgs;
 
   davix-copy = davix.override { enableThirdPartyCopy = true; };
 
-  cantata = libsForQt5.callPackage ../applications/audio/cantata { };
-
   cantoolz = callPackage ../tools/networking/cantoolz { };
 
   can-utils = callPackage ../os-specific/linux/can-utils { };