cmus: move to pkgs/by-name

Author: quantenzitrone

pkgs/applications/audio/cmus/default.nix pkgs/by-name/cm/cmus/package.nixpkgs/applications/audio/cmus/default.nix renamed to pkgs/by-name/cm/cmus/package.nix

@@ -13,7 +13,7 @@
   aoSupport ? !stdenv.hostPlatform.isLinux,
   libao ? null,
   jackSupport ? false,
-  libjack ? null,
+  libjack2 ? null,
   samplerateSupport ? jackSupport,
   libsamplerate ? null,
   ossSupport ? false,
@@ -41,7 +41,7 @@
   discidSupport ? false,
   libdiscid ? null,
   ffmpegSupport ? true,
-  ffmpeg ? null,
+  ffmpeg_7 ? null,
   flacSupport ? true,
   flac ? null,
   madSupport ? true,
@@ -77,6 +77,8 @@ assert vorbisSupport -> !tremorSupport;
 assert tremorSupport -> !vorbisSupport;
 
 let
+  # https://github.com/cmus/cmus/issues/1459
+  ffmpeg = ffmpeg_7;
 
   mkFlag =
     b: f: dep:
@@ -95,17 +97,17 @@ let
     # Audio output
     (mkFlag alsaSupport "CONFIG_ALSA=y" alsa-lib)
     (mkFlag aoSupport "CONFIG_AO=y" libao)
-    (mkFlag jackSupport "CONFIG_JACK=y" libjack)
+    (mkFlag jackSupport "CONFIG_JACK=y" libjack2)
     (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate)
     (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss)
     (mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio)
     (mkFlag sndioSupport "CONFIG_SNDIO=y" sndio)
     (mkFlag mprisSupport "CONFIG_MPRIS=y" systemd)
 
-    #(mkFlag artsSupport      "CONFIG_ARTS=y")
-    #(mkFlag roarSupport      "CONFIG_ROAR=y")
-    #(mkFlag sunSupport       "CONFIG_SUN=y")
-    #(mkFlag waveoutSupport   "CONFIG_WAVEOUT=y")
+    #(mkFlag artsSupport "CONFIG_ARTS=y")
+    #(mkFlag roarSupport "CONFIG_ROAR=y")
+    #(mkFlag sunSupport "CONFIG_SUN=y")
+    #(mkFlag waveoutSupport "CONFIG_WAVEOUT=y")
 
     # Input file formats
     (mkFlag cddbSupport "CONFIG_CDDB=y" libcddb)
@@ -129,7 +131,7 @@ let
     (mkFlag mp4Support "CONFIG_MP4=y" mp4v2)
     (mkFlag aacSupport "CONFIG_AAC=y" faad2)
 
-    #(mkFlag vtxSupport    "CONFIG_VTX=y"     libayemu)
+    #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu)
   ];
 in
 
@@ -163,11 +165,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "LD=$(CC)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Small, fast and powerful console music player for Linux and *BSD";
     homepage = "https://cmus.github.io/";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.oxij ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ oxij ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }

pkgs/top-level/all-packages.nix

@@ -10723,11 +10723,6 @@ with pkgs;
 
   clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
 
-  cmus = callPackage ../applications/audio/cmus {
-    libjack = libjack2;
-    ffmpeg = ffmpeg_7;
-  };
-
   cni = callPackage ../applications/networking/cluster/cni { };
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };