linphone: 3.8.5 -> 3.10.2

This commit is contained in:
Michael Raskin 2016-09-06 18:17:14 +02:00
parent 13092a7ff9
commit 5c686923de
2 changed files with 20 additions and 16 deletions

View File

@ -1,32 +1,36 @@
{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
, mediastreamer-openh264, makeWrapper , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linphone-${version}"; baseName = "linphone";
major = "3.9"; version = "3.10.2";
version = "${major}.1"; name = "${baseName}-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://savannah/linphone/${major}.x/sources/${name}.tar.gz"; owner = "BelledonneCommunications";
sha256 = "1b14gwq36d0sbn1125if9zydll9kliigk19zchbqiy9n2gjymrl4"; repo = "${baseName}";
rev = "${version}";
sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p";
}; };
buildInputs = [ buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango
]; ];
nativeBuildInputs = [ intltool pkgconfig makeWrapper ]; nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ];
configureFlags = [ NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0
"--enable-ldap" -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/
"--with-ffmpeg=${ffmpeg.dev}" -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0
"--enable-external-ortp" -I${gtk2}/lib/gtk-2.0/include
"--enable-external-mediastreamer" -DLIBLINPHONE_GIT_VERSION=\"v${version}\"
]; ";
postInstall = '' postInstall = ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do

View File

@ -13881,7 +13881,7 @@ in
links2 = callPackage ../applications/networking/browsers/links2 { }; links2 = callPackage ../applications/networking/browsers/links2 { };
linphone = callPackage ../applications/networking/instant-messengers/linphone rec { linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
ffmpeg = ffmpeg_2; polarssl = mbedtls_1_3;
}; };
linuxsampler = callPackage ../applications/audio/linuxsampler { linuxsampler = callPackage ../applications/audio/linuxsampler {