diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-10-29 05:07:16 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-10-29 05:09:28 +0200 |
| commit | 40979710f72278e653bb0be2828a581a18b6c902 (patch) | |
| tree | 170f89153bd638a31c3b4e88dc4181c962201acf /pkgs | |
| parent | fd6cde69537f5fcbd1f93ebfe24c2874f8cbc697 (diff) | |
| download | nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar.gz nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar.bz2 nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar.lz nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar.xz nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.tar.zst nixpkgs-40979710f72278e653bb0be2828a581a18b6c902.zip | |
mediatomb: fix build by fetching a slightly newer git revision which has patches for new versions of dependencies, add more dependencies, clean up.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/mediatomb/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/servers/mediatomb/zmm_new.patch | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 13 insertions, 25 deletions
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; }; } diff --git a/pkgs/servers/mediatomb/zmm_new.patch b/pkgs/servers/mediatomb/zmm_new.patch deleted file mode 100644 index 5238b42035b..00000000000 --- a/pkgs/servers/mediatomb/zmm_new.patch +++ /dev/null @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be2631831d1..48f9d229801 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7388,7 +7388,9 @@ let mailman = callPackage ../servers/mail/mailman { }; - mediatomb = callPackage ../servers/mediatomb { }; + mediatomb = callPackage ../servers/mediatomb { + spidermonkey = spidermonkey_185; + }; memcached = callPackage ../servers/memcached {}; |