alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up.

Browse source
This commit is contained in:
Evgeny Egorochkin 2014-10-29 05:07:16 +02:00
parent fd6cde6953
commit 40979710f7
3 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/servers/mediatomb/default.nix
View file

@ -1,28 +1,27 @@
{ stdenv, fetchurl { stdenv, fetchgit
, sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }: , sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file
, pkgconfig, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mediatomb-${version}"; name = "mediatomb-${version}";
version = "0.12.1"; version = "0.12.1";
src = fetchurl { src = fetchgit {
url = "mirror://sourceforge/mediatomb/${name}.tar.gz"; url = meta.repositories.git;
sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii"; rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2";
sha256 = "7b51d488ac0b93c7720f8f8373970884a55b0879b1f6941873e916f41177d062";
}; };
patches = [ ./zmm_new.patch ]; buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac
pkgconfig autoreconfHook ];
buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
configureFlags = [ "--enable-inotify" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://mediatomb.cc; homepage = http://mediatomb.cc;
repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb;
description = "UPnP MediaServer with a web user interface"; description = "UPnP MediaServer with a web user interface";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true;
}; };
} }

13
pkgs/servers/mediatomb/zmm_new.patch
View file

@ -1,13 +0,0 @@
diff -rc mediatomb-0.12.1.old/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h
*** mediatomb-0.12.1.old/src/zmm/object.h 2010-03-25 07:58:08.000000000 -0700
--- mediatomb-0.12.1/src/zmm/object.h 2013-02-15 17:57:02.000000000 -0800
***************
*** 33,38 ****
--- 33,39 ----
#define __ZMM_OBJECT_H__
#include <new> // for size_t
+ #include <stddef.h>
#include "atomic.h"
namespace zmm

4
pkgs/top-level/all-packages.nix
View file

@ -7388,7 +7388,9 @@ let
mailman = callPackage ../servers/mail/mailman { }; mailman = callPackage ../servers/mail/mailman { };
mediatomb = callPackage ../servers/mediatomb { }; mediatomb = callPackage ../servers/mediatomb {
spidermonkey = spidermonkey_185;
};
memcached = callPackage ../servers/memcached {}; memcached = callPackage ../servers/memcached {};