Unverified Commit 1883c1af authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

cmus: move to pkgs/by-name (#464307)

parents 392236df cd77501b

pkgs/applications/audio/cmus/default.nix→pkgs/by-name/cm/cmus/package.nix

+14 −12
Original line number Diff line number Diff line
@@ -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,7 +97,7 @@ 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)
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -10726,11 +10726,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 { };