diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-19 22:05:34 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-19 22:05:34 +0000 |
| commit | 3b3ee13b9d33362d980b65ce09be1ae79fd7905d (patch) | |
| tree | b0aebf71f135442551bbcfbc484741d6f09c11d3 /pkgs/applications/audio | |
| parent | 5411beb172b41bd168ae0a92c81a7764e61bf80f (diff) | |
Updating lame
Updating libgpod
Making gtkpod accept 'ogg' files, and made it convert them well to mp3, if 'lame'
and oggdec is in path. It should better reference lame and libvorbis store path
files.
svn path=/nixpkgs/trunk/; revision=17888
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/gtkpod/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/audio/lame/default.nix | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 962c0c7ba878..30400b3c5e60 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag }: +{ stdenv, fetchurl, pkgconfig, libgpod, gtk, glib, gettext, perl, perlXMLParser, libglade, flex, libid3tag, libvorbis }: stdenv.mkDerivation { name = "gtkpod-0.99.14"; @@ -7,7 +7,12 @@ stdenv.mkDerivation { url = mirror://sourceforge/gtkpod/gtkpod-0.99.14.tar.gz; sha256 = "0ggcfyhcdlf3br88csdki215k4clxixa192afz6f16k7h8s2iqbk"; }; - buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag]; + + buildInputs = [ pkgconfig libgpod gettext perl perlXMLParser gtk libglade flex libid3tag libvorbis ]; + + patchPhase = '' + sed -i 's/which/type -P/' scripts/*.sh + ''; meta = { description = "GTK Manager for an Apple ipod"; diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix index 4a97b25cd60c..f9c0e151c897 100644 --- a/pkgs/applications/audio/lame/default.nix +++ b/pkgs/applications/audio/lame/default.nix @@ -1,9 +1,13 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "lame-3.97"; + name = "lame-3.98.2"; src = fetchurl { - url = mirror://sourceforge/lame/lame-3.97.tar.gz ; - sha256 = "05xy9lv6m9s013lzlvhxwvr1586c239xaiiwka52k18hs6k388qa"; + url = mirror://sourceforge/lame/lame-398-2.tar.gz; + sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1"; }; + + # Either disable static, or fix the rpath of 'lame' for it to point + # properly to the libmp3lame shared object. + dontDisableStatic = true; } |