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

mediastreamer2: fix meta.homepage

Browse Source 
+ remove openssl from inputs (it's not used)
+ fix git version CFLAGS
This commit is contained in:
c0bw3b 2019-11-23 18:42:19 +01:00
parent 4b94f4bf36
commit 7247c2bea6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/mediastreamer/default.nix
View File

@ -1,17 +1,16 @@
{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm { stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp
, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
, python, libXext, libmatroska, openssl, fetchpatch , python, libXext, libmatroska, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "mediastreamer2"; pname = "mediastreamer2";
version = "2.16.1"; version = "2.16.1";
name = "${baseName}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BelledonneCommunications"; owner = "BelledonneCommunications";
repo = baseName; repo = pname;
rev = version; rev = version;
sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
}; };
@ -31,19 +30,18 @@ stdenv.mkDerivation rec {
alsaLib libpulseaudio speex gsm libopus alsaLib libpulseaudio speex gsm libopus
ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp
ortp libv4l libpcap srtp bctoolbox libXext libmatroska ortp libv4l libpcap srtp bctoolbox libXext libmatroska
openssl
]; ];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-DGIT_VERSION=\"v2.14.0\"" "-DGIT_VERSION=\"v${version}\""
"-Wno-error=deprecated-declarations" "-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type" "-Wno-error=cast-function-type"
]; ];
NIX_LDFLAGS = "-lXext -lssl"; NIX_LDFLAGS = "-lXext";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview; homepage = http://www.linphone.org/technical-corner/mediastreamer2;
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
}; };