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

Merge branch 'master' into staging

Browse Source 
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
This commit is contained in:
obadz
2016-08-27 23:54:54 +01:00
parent 132571454c df27c35e9a
commit 3de6e5be50
209 changed files with 5290 additions and 5482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/sip/freeswitch/default.nix
+11 -7
View File
@@ -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";