Merge remote-tracking branch 'origin/master' into staging

pkgs/development/libraries/mediastreamer/default.nix

@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     "--enable-glx"
   ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
   meta = with stdenv.lib; {
     description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications";
     homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;

pkgs/development/libraries/taglib/1.9.nix

@@ -0,0 +1,24 @@
+{stdenv, fetchurl, zlib, cmake}:
+
+stdenv.mkDerivation rec {
+  name = "taglib-1.9.1";
+
+  src = fetchurl {
+    url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
+    sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
+  };
+
+  cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
+
+  buildInputs = [ zlib ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = http://developer.kde.org/~wheeler/taglib.html;
+    repositories.git = git://github.com/taglib/taglib.git;
+
+    description = "A library for reading and editing the meta-data of several popular audio formats";
+    inherit (cmake.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}