From 7125190b048f00d70cdb3f56c4fce4ec6498484e Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 4 Mar 2018 18:30:09 +0000 Subject: [PATCH] cmus: use libcdio-paranoia --- pkgs/applications/audio/cmus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index c0dd2e92178c..f8c5a4e5acff 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -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) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb62d00c3b50..175417dc0974 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;