diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-26 19:40:22 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-26 19:40:22 +0000 |
| commit | 086945942dfa4fc2ebb744384cd52fdca398ad82 (patch) | |
| tree | c895ab4d8aee6851c597e1f68b5afceb468569c7 | |
| parent | 842e80dd6079a313c770e394134a046947173c2e (diff) | |
| download | nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar.gz nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar.bz2 nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar.lz nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar.xz nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.tar.zst nixpkgs-086945942dfa4fc2ebb744384cd52fdca398ad82.zip | |
Add mutagen, upgrade libgpod
svn path=/nixpkgs/trunk/; revision=23955
| -rw-r--r-- | pkgs/development/libraries/libgpod/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
3 files changed, 31 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 54f8d6fcba7..6cd803b4c32 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,13 +1,20 @@ -{stdenv, fetchurl, gettext, perl, perlXMLParser, pkgconfig, glib, libxml2 }: +{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, + libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib, + libimobiledevice, python, pygobject, mutagen, swig }: -stdenv.mkDerivation { - name = "libgpod-0.7.2"; +stdenv.mkDerivation rec { + name = "libgpod-0.7.94"; src = fetchurl { - url = mirror://sourceforge/gtkpod/libgpod-0.7.2.tar.gz; - sha256 = "0xq7947rqf99n9zvbpxfwwkid5z8d2szv5s0024rq37d6zy333rf"; + url = "mirror://sourceforge/gtkpod/${name}.tar.gz"; + sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4"; }; - buildInputs = [ gettext perl perlXMLParser pkgconfig glib libxml2 ]; + patchPhase = ''sed -e "s,udevdir=,&$out," -i configure''; + configureFlags = "--without-hal --enable-udev"; + + buildInputs = [ gettext perl perlXMLParser intltool pkgconfig glib libxml2 + sqlite libplist libusb1 zlib sg3_utils gtk taglib libimobiledevice + python pygobject mutagen swig ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db87d98bab8..400b4d27c3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,7 +3236,9 @@ let libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + inherit (pkgs.pythonPackages) mutagen; + }; libharu = callPackage ../development/libraries/libharu { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8e96cdce5c..54dadcff79a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -375,6 +375,21 @@ rec { }; })); + mutagen = buildPythonPackage (rec { + name = "mutagen-1.20"; + + src = fetchurl { + url = "http://mutagen.googlecode.com/files/${name}.tar.gz"; + sha256 = "1rz63nh7r6qj3zsidf8d3a7ih647prvvqzi51p8dqkqmvrwc8mky"; + }; + + meta = { + description = "Python multimedia tagging library"; + homepage = http://code.google.com/p/mutagen; + license = "LGPLv2"; + }; + }); + namebench = buildPythonPackage (rec { name = "namebench-1.0.5"; |