diff options
author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-03-04 18:29:42 +0000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:12:26 +0100 |
commit | 2cc7ac19b6a44d2bb32abc390821a85673c3bd08 (patch) | |
tree | d7ccd9bf2b43e0ac22e45e83798956fe80dc1438 | |
parent | 92377b06a273f88e1c6455f32edc49df7dce57c7 (diff) |
abcde: switch to libcdio-paranoia
-rw-r--r-- | pkgs/applications/audio/abcde/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index a23af5b5caf88..b74d85b9dbfa0 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 +{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3 , lame, flac, eject, mkcue, glyr , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: @@ -42,7 +42,7 @@ in postFixup = '' for cmd in abcde cddb-tool abcde-musicbrainz-tool; do wrapProgram "$out/bin/$cmd" --prefix PATH ":" \ - ${stdenv.lib.makeBinPath [ "$out" which libcdio cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} + ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]} done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfe4c9689eb1d..bb62d00c3b502 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14439,7 +14439,6 @@ with pkgs; abcde = callPackage ../applications/audio/abcde { inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; - libcdio = libcdio082; }; abiword = callPackage ../applications/office/abiword { |