diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-02-12 09:39:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 09:39:06 +0800 |
| commit | 81a6e50110ecaa0db9bce51b3a5398f43ab8b636 (patch) | |
| tree | ce2df7b22149c1ec5d55131a23ae4cae9cda9fc0 /pkgs/applications | |
| parent | b22883c9a4b60d920c88bd7efb4ba80bdbacdb26 (diff) | |
| parent | 27b5d9bed1ac450297a755ad772e521c413bb210 (diff) | |
| download | nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar.gz nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar.bz2 nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar.lz nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar.xz nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.tar.zst nixlib-81a6e50110ecaa0db9bce51b3a5398f43ab8b636.zip | |
Merge pull request #34800 from adisbladis/linphone-3_12_0
linphone: 3.10.2 -> 3.12.0
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/linphone/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 55187f335981..e0aecd2c8102 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,29 +1,33 @@ { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl +, python, graphviz, belcard }: stdenv.mkDerivation rec { baseName = "linphone"; - version = "3.10.2"; + version = "3.12.0"; name = "${baseName}-${version}"; src = fetchFromGitHub { owner = "BelledonneCommunications"; repo = "${baseName}"; rev = "${version}"; - sha256 = "053gad4amdbq5za8f2n9j5q59nkky0w098zbsa3dvpcqvv7ar16p"; + sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; }; buildInputs = [ readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango + bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard ]; - nativeBuildInputs = [ intltool pkgconfig makeWrapper cmake doxygen ]; + nativeBuildInputs = [ + intltool pkgconfig makeWrapper cmake doxygen graphviz + (python.withPackages (ps: [ ps.pystache ps.six ])) + ]; NIX_CFLAGS_COMPILE = " -Wno-error -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${gtk2.dev}/include/gtk-2.0/ |