Unverified Commit 7125190b authored by Piotr Bogdan's avatar Piotr Bogdan Committed by Vladimír Čunát
Browse files

cmus: use libcdio-paranoia

parent 2cc7ac19

pkgs/applications/audio/cmus/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#, waveoutSupport



, cddbSupport ? true, libcddb ? null

, cdioSupport ? true, libcdio ? null

, cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null

, cueSupport ? true, libcue ? null

, discidSupport ? (!stdenv.isDarwin), libdiscid ? null

, ffmpegSupport ? true, ffmpeg ? null
@@ -69,7 +69,7 @@ let 


    # Input file formats

    (mkFlag cddbSupport    "CONFIG_CDDB=y"    libcddb)

    (mkFlag cdioSupport    "CONFIG_CDIO=y"    libcdio)

    (mkFlag cdioSupport    "CONFIG_CDIO=y"    [ libcdio libcdio-paranoia ])

    (mkFlag cueSupport     "CONFIG_CUE=y"     libcue)

    (mkFlag discidSupport  "CONFIG_DISCID=y"  libdiscid)

    (mkFlag ffmpegSupport  "CONFIG_FFMPEG=y"  ffmpeg)

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -14829,7 +14829,6 @@ with pkgs; 
  cmus = callPackage ../applications/audio/cmus {

    inherit (darwin.apple_sdk.frameworks) CoreAudio;

    libjack = libjack2;

    libcdio = libcdio082;

    ffmpeg = ffmpeg_2;















    pulseaudioSupport = config.pulseaudio or false;