diff options
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/linphone/default.nix | 41 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 23 insertions, 24 deletions
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index e10b4f9c83c57..f9bd941b2f663 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip -, speex, readline, mediastreamer, libsoup, udev, libnotify }: +{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp +, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev +, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip +}: stdenv.mkDerivation rec { - name = "linphone-3.6.1"; + name = "linphone-3.8.1"; src = fetchurl { - url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz"; - sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5"; + url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz"; + sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd"; }; - buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev - libnotify ]; + buildInputs = [ + readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 + polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip + ]; nativeBuildInputs = [ intltool pkgconfig ]; - preConfigure = '' - rm -r mediastreamer2 oRTP - sed -i s,/bin/echo,echo, coreapi/Makefile* - ''; + configureFlags = [ + "--enable-ldap" + "--with-ffmpeg=${ffmpeg}" + "--with-polarssl=${polarssl}" + "--enable-lime" + "--enable-external-ortp" + "--enable-external-mediastreamer" + ]; - configureFlags = "--enable-external-ortp --enable-external-mediastreamer"; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # I'm lazy to fix these for them - - meta = { + meta = with stdenv.lib; { homepage = http://www.linphone.org/; description = "Open Source video SIP softphone"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; - broken = true; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2a2613b8afd6..6ac30dd142647 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11116,11 +11116,7 @@ let links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { - inherit (gnome) libglade; - libexosip = libexosip_3; - libosip = libosip_3; - }; + linphone = callPackage ../applications/networking/instant-messengers/linphone rec { }; linuxsampler = callPackage ../applications/audio/linuxsampler { bison = bison2; |