diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/servers/sip | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/servers/sip')
| -rw-r--r-- | pkgs/servers/sip/freeswitch/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 1cce4c518ea..977575491f5 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,16 +1,20 @@ -{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg -, libzrtpcpp }: +{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline +, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre +, ldns, libedit, yasm, which, lua, libopus, libsndfile }: stdenv.mkDerivation rec { - name = "freeswitch-1.6.6"; + name = "freeswitch-1.6.9"; src = fetchurl { - url = "http://files.freeswitch.org/releases/freeswitch/${name}.tar.bz2"; - sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k"; + url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; + sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7"; }; - buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg - libzrtpcpp ]; + buildInputs = [ + ncurses curl pkgconfig gnutls readline openssl perl libjpeg + sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus + libsndfile + ]; NIX_CFLAGS_COMPILE = "-Wno-error"; |