From 40979710f72278e653bb0be2828a581a18b6c902 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 29 Oct 2014 05:07:16 +0200 Subject: mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up. --- pkgs/servers/mediatomb/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'pkgs/servers/mediatomb/default.nix') diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index d88e1dd9e14..4d3ef231af3 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl -, sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }: +{ stdenv, fetchgit +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { name = "mediatomb-${version}"; version = "0.12.1"; - src = fetchurl { - url = "mirror://sourceforge/mediatomb/${name}.tar.gz"; - sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii"; + src = fetchgit { + url = meta.repositories.git; + rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2"; + sha256 = "7b51d488ac0b93c7720f8f8373970884a55b0879b1f6941873e916f41177d062"; }; - patches = [ ./zmm_new.patch ]; - - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ]; - - configureFlags = [ "--enable-inotify" ]; + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + pkgconfig autoreconfHook ]; meta = with stdenv.lib; { homepage = http://mediatomb.cc; + repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb; description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; - broken = true; }; } -- cgit 1.4.1