diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/mediastreamer | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mediastreamer')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mediastreamer/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 3cda9ff3006d..aaa31b29e9ea 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -4,11 +4,11 @@ , cmake , doxygen , fetchFromGitLab -, fetchpatch , ffmpeg_3 , glew , gsm , intltool +, lib , libGL , libGLU , libX11 @@ -24,16 +24,16 @@ , libvpx , ortp , pkg-config -, python +, python3 , SDL , speex , srtp -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.13"; + version = "4.5.1"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0w84v1ajhyysr41qaj7x4njwdak84cc10lq33hl8lq68a52fc2vw"; + sha256 = "0aqma9834lzy1593qb9qwmzvzn50y6fzhmmg493jznf8977b0gsw"; }; patches = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doxygen intltool pkg-config - python + python3 ]; propagatedBuildInputs = [ @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { srtp ]; + strictDeps = true; + # Do not build static libraries cmakeFlags = [ "-DENABLE_STATIC=NO" ]; @@ -102,7 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; |