diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-26 23:03:47 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-26 23:03:47 +0000 |
commit | b91ebb6f406a9e0af466be144cc78089e91ccff8 (patch) | |
tree | 4c8d55e692ec46b30fc34473a3bef13193177160 /pkgs | |
parent | 0c4c01f6c990d18136d12b742220b92342f2c565 (diff) |
Fixing cdrdao, getting also mp3 and ogg support in it.
svn path=/nixpkgs/trunk/; revision=17972
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/cd-dvd/cdrdao/default.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 3803469bf5307..e03f5f706aa64 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a7b3deca03c..76ed11d8328cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |