diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 1abcacaf959..4d870fdd94d 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, audacious, dbus_glib, gettext , libmad, xlibs, alsaLib, taglib, libmpcdec, libogg, libvorbis +, libcdio, libcddb }: stdenv.mkDerivation { @@ -13,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig audacious dbus_glib gettext libmad xlibs.libXcomposite alsaLib taglib libmpcdec - libogg libvorbis + libogg libvorbis libcdio libcddb ]; preBuild = '' diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index e048c921794..63103c0a9ae 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -7,15 +7,12 @@ stdenv.mkDerivation rec { sha256 = "1xfizvs0yvgs9ddazalsmccd6whqi5fy4dlm3dhcqj72wvpf7w0v"; }; - buildInputs = [ libcddb pkgconfig ncurses ]; + buildInputs = [libcddb pkgconfig ncurses]; doCheck = true; meta = { - description = ''GNU libcdio is a library for OS-idependent CD-ROM and - CD image access. It includes a library for working with - ISO-9660 filesystems (libiso9660), as well as utility - programs such as an audio CD player and an extractor.''; + description = "GNU libcdio is a library for OS-idependent CD-ROM and CD image access"; license = "GPLv2+"; homepage = http://www.gnu.org/software/libcdio/; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2d1ef17f68..99a91334ff6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4833,7 +4833,8 @@ let pkgs = rec { audacious_plugins = import ../applications/audio/audacious/plugins.nix { inherit fetchurl stdenv pkgconfig audacious dbus_glib gettext - libmad xlibs alsaLib taglib libmpcdec libogg libvorbis; + libmad xlibs alsaLib taglib libmpcdec libogg libvorbis + libcdio libcddb; }; audacity = import ../applications/audio/audacity {