lol

Add mutagen, upgrade libgpod

svn path=/nixpkgs/trunk/; revision=23955

+31 -7
+13 -6
pkgs/development/libraries/libgpod/default.nix
··· 1 - {stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }: 1 + {stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, 2 + libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib, 3 + libimobiledevice, python, pygobject, mutagen, swig }: 2 4 3 - stdenv.mkDerivation { 4 - name = "libgpod-0.7.2"; 5 + stdenv.mkDerivation rec { 6 + name = "libgpod-0.7.94"; 5 7 src = fetchurl { 6 - url = mirror://sourceforge/gtkpod/libgpod-0.7.2.tar.gz; 7 - sha256 = "0xq7947rqf99n9zvbpxfwwkid5z8d2szv5s0024rq37d6zy333rf"; 8 + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; 9 + sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4"; 8 10 }; 9 11 10 - buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ]; 12 + patchPhase = ''sed -e "s,udevdir=,&$out," -i configure''; 13 + configureFlags = "--without-hal --enable-udev"; 14 + 15 + buildInputs = [ gettext perl perlXMLParser intltool pkgconfig glib libxml2 16 + sqlite libplist libusb1 zlib sg3_utils gtk taglib libimobiledevice 17 + python pygobject mutagen swig ]; 11 18 12 19 meta = { 13 20 homepage = http://gtkpod.sourceforge.net/;
+3 -1
pkgs/top-level/all-packages.nix
··· 3236 3236 3237 3237 libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; 3238 3238 3239 - libgpod = callPackage ../development/libraries/libgpod { }; 3239 + libgpod = callPackage ../development/libraries/libgpod { 3240 + inherit (pkgs.pythonPackages) mutagen; 3241 + }; 3240 3242 3241 3243 libharu = callPackage ../development/libraries/libharu { }; 3242 3244
+15
pkgs/top-level/python-packages.nix
··· 375 375 }; 376 376 })); 377 377 378 + mutagen = buildPythonPackage (rec { 379 + name = "mutagen-1.20"; 380 + 381 + src = fetchurl { 382 + url = "http://mutagen.googlecode.com/files/${name}.tar.gz"; 383 + sha256 = "1rz63nh7r6qj3zsidf8d3a7ih647prvvqzi51p8dqkqmvrwc8mky"; 384 + }; 385 + 386 + meta = { 387 + description = "Python multimedia tagging library"; 388 + homepage = http://code.google.com/p/mutagen; 389 + license = "LGPLv2"; 390 + }; 391 + }); 392 + 378 393 379 394 namebench = buildPythonPackage (rec { 380 395 name = "namebench-1.0.5";