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

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";

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;
 }

pkgs/development/libraries/libgpod/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }:
 
 stdenv.mkDerivation {
-  name = "libgpod-0.7";
+  name = "libgpod-0.7.2";
   src = fetchurl {
-    url = mirror://sourceforge/gtkpod/libgpod-0.7.0.tar.gz;
-    sha256 = "07jfxf4v6wd33aps9ry8kmp0k7lg1k933bag4f9vnpns3j5l63g1";
+    url = mirror://sourceforge/gtkpod/libgpod-0.7.2.tar.gz;
+    sha256 = "0xq7947rqf99n9zvbpxfwwkid5z8d2szv5s0024rq37d6zy333rf";
   };
 
   buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ];

pkgs/top-level/all-packages.nix

@@ -7064,7 +7064,7 @@ let
   };
 
   gtkpod = import ../applications/audio/gtkpod {
-    inherit stdenv fetchurl pkgconfig libgpod gettext perl perlXMLParser flex libid3tag;
+    inherit stdenv fetchurl pkgconfig libgpod gettext perl perlXMLParser flex libid3tag libvorbis;
     inherit (gtkLibs) gtk glib;
     inherit (gnome) libglade;
   };