Fixing cdrdao, getting also mp3 and ogg support in it.

svn path=/nixpkgs/trunk/; revision=17972
This commit is contained in:
Lluís Batlle i Rossell 2009-10-26 23:03:47 +00:00
parent 0c4c01f6c9
commit b91ebb6f40
2 changed files with 12 additions and 6 deletions

View File

@ -1,16 +1,22 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, lame, libvorbis, libmad, pkgconfig, libao}:
stdenv.mkDerivation {
name = "cdrdao-1.2.2";
name = "cdrdao-1.2.3";
src = fetchurl {
url = mirror://sourceforge/cdrdao/cdrdao-1.2.2.tar.bz2;
sha256 = "0f40wm08zm2809xa6kscfk10vgqa3g2vdydnr641r3kzwm0h066y";
url = mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2;
sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1";
};
makeFlags = "RM=rm LN=ln MV=mv";
#buildInputs = [cmake libcap zlib bzip2];
buildInputs = [ lame libvorbis libmad pkgconfig libao ];
# we have glibc/include/linux as a symlink to the kernel headers,
# and the magic '..' points to kernelheaders, and not back to the glibc/include
patchPhase = ''
sed -i 's,linux/../,,g' dao/sg_err.h
'';
meta = {
description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode";

View File

@ -542,7 +542,7 @@ let
};
cdrdao = import ../tools/cd-dvd/cdrdao {
inherit fetchurl stdenv;
inherit fetchurl stdenv lame libvorbis libmad pkgconfig libao;
};
cdrkit = import ../tools/cd-dvd/cdrkit {