diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-23 18:42:19 +0100 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-11-23 19:11:16 +0100 |
commit | 7247c2bea6886dd81ca423274ca44cb98ce46c12 (patch) | |
tree | 7f4666cc566b3eab2470b41eb05c939ca3e20cab /pkgs/development/libraries/mediastreamer | |
parent | 4b94f4bf3649cfd522fe19a010f47effb5c9a1c8 (diff) | |
download | nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar.gz nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar.bz2 nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar.lz nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar.xz nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.tar.zst nixpkgs-7247c2bea6886dd81ca423274ca44cb98ce46c12.zip |
mediastreamer2: fix meta.homepage
+ remove openssl from inputs (it's not used) + fix git version CFLAGS
Diffstat (limited to 'pkgs/development/libraries/mediastreamer')
-rw-r--r-- | pkgs/development/libraries/mediastreamer/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 93e73a44bc9..f1ab28dfa1c 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,17 +1,16 @@ { stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm , libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, openssl, fetchpatch +, python, libXext, libmatroska, fetchpatch }: stdenv.mkDerivation rec { - baseName = "mediastreamer2"; + pname = "mediastreamer2"; version = "2.16.1"; - name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; - repo = baseName; + repo = pname; rev = version; sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; }; @@ -31,19 +30,18 @@ stdenv.mkDerivation rec { alsaLib libpulseaudio speex gsm libopus ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp bctoolbox libXext libmatroska - openssl ]; NIX_CFLAGS_COMPILE = [ - "-DGIT_VERSION=\"v2.14.0\"" + "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" "-Wno-error=cast-function-type" ]; - NIX_LDFLAGS = "-lXext -lssl"; + NIX_LDFLAGS = "-lXext"; 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; + homepage = http://www.linphone.org/technical-corner/mediastreamer2; license = licenses.gpl2; platforms = platforms.linux; }; |