public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mediatomb.130215' of https://github.com/jcumming/nixpkgs

Browse Source 
Didn't build before, builds now.
This commit is contained in:
Shea Levy 2013-02-22 15:39:49 -05:00
commit 8e5331a499
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/mediatomb/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii"; sha256 = "1k8i5zvgik7cad7znd8358grzwh62frpqww1a5rwkldrlws3q5ii";
}; };
patches = [ ./zmm_new.patch ];
buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ]; buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file ];
configureFlags = [ "--enable-inotify" ]; configureFlags = [ "--enable-inotify" ];
@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

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

@ -0,0 +1,13 @@
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