summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2018-02-10 13:18:44 +0800
committeradisbladis <adis@blad.is>2018-02-10 13:18:44 +0800
commitab2a3c74aaf53a40b4b122c08e54939e58a659d0 (patch)
treea535f0ed9d92ea5910d309b1babd9846c1360757 /pkgs
parenta5047cd5f080e036408828c3476cd7ac75103267 (diff)
downloadnixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar.gz
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar.bz2
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar.lz
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar.xz
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.tar.zst
nixlib-ab2a3c74aaf53a40b4b122c08e54939e58a659d0.zip
mediastreamer: 2.14.0 -> 2.16.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/mediastreamer/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 06cc53abb564..90f154367643 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,22 +1,29 @@
 { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
 , libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
 , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
-, python, libXext, libmatroska, openssl
+, python, libXext, libmatroska, openssl, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   baseName = "mediastreamer2";
-  version = "2.14.0";
+  version = "2.16.1";
   name = "${baseName}-${version}";
 
   src = fetchFromGitHub {
     owner = "BelledonneCommunications";
     repo = "${baseName}";
     rev = "${version}";
-    sha256 = "1b59rzsaw54mhy4pz9hndmim4rgidkn7s6c4iyl34mz58lwxpmqp";
+    sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
   };
 
-  patches = [ ./plugins_dir.patch ];
+  patches = [
+    (fetchpatch {
+      name = "allow-build-without-git.patch";
+      url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch";
+      sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy";
+    })
+    ./plugins_dir.patch
+  ];
 
   nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ];