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

linphone: polarssl -> mbedtls

Browse Source 
+ add bcg729 input
+ move bcunit to nativeBuildInputs
This commit is contained in:
c0bw3b 2019-11-23 19:16:51 +01:00
parent 8933dd6b58
commit 9c4f51220e
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

@ -2,19 +2,18 @@
, 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, bzrtp , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, polarssl , libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, mbedtls
, python, graphviz, belcard , python, graphviz, belcard, bcg729
, withGui ? true , withGui ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "linphone"; pname = "linphone";
version = "3.12.0"; version = "3.12.0";
name = "${baseName}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BelledonneCommunications"; owner = "BelledonneCommunications";
repo = baseName; repo = pname;
rev = version; rev = version;
sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
}; };
@ -27,21 +26,25 @@ stdenv.mkDerivation rec {
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
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip mbedtls libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
bctoolbox libmatroska bcunit gdk-pixbuf glib cairo pango bzrtp belcard bctoolbox libmatroska gdk-pixbuf glib cairo pango bzrtp belcard bcg729
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
intltool pkgconfig makeWrapper cmake doxygen graphviz intltool pkgconfig makeWrapper cmake bcunit doxygen graphviz
(python.withPackages (ps: [ ps.pystache ps.six ])) (python.withPackages (ps: [ ps.pystache ps.six ]))
]; ];
NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 NIX_CFLAGS_COMPILE = [
-I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ "-Wno-error"
-I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 "-I${glib.dev}/include/glib-2.0"
-I${gtk2}/lib/gtk-2.0/include "-I${glib.out}/lib/glib-2.0/include"
-DLIBLINPHONE_GIT_VERSION=\"v${version}\" "-I${gtk2.dev}/include/gtk-2.0/"
"; "-I${cairo.dev}/include/cairo"
"-I${pango.dev}/include/pango-1.0"
"-I${gtk2}/lib/gtk-2.0/include"
"-DLIBLINPHONE_GIT_VERSION=\"v${version}\""
];
postInstall = '' postInstall = ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do
@ -50,8 +53,8 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linphone.org/; homepage = https://www.linphone.org/;
description = "Open Source video SIP softphone"; description = "Open source SIP phone for voice/video calls and instant messaging";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };

4
pkgs/top-level/all-packages.nix
View File

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