Merge pull request #51854 from pmahoney/freeswitch

Freeswitch
This commit is contained in:
Matthew Bauer 2018-12-17 23:43:25 -06:00 committed by GitHub
commit dbd0a78e5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions

View File

@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
description = "Library with the aim of simplifying DNS programming in C"; description = "Library with the aim of simplifying DNS programming in C";
license = licenses.bsd3; license = licenses.bsd3;
homepage = http://www.nlnetlabs.nl/projects/ldns/; homepage = http://www.nlnetlabs.nl/projects/ldns/;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ jgeerds ]; maintainers = with maintainers; [ jgeerds ];
}; };
} }

View File

@ -1,6 +1,9 @@
{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
, openssl, perl, sqlite, libjpeg, speex, pcre , openssl, perl, sqlite, libjpeg, speex, pcre
, ldns, libedit, yasm, which, lua, libopus, libsndfile }: , ldns, libedit, yasm, which, lua, libopus, libsndfile
, SystemConfiguration
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "freeswitch-1.6.20"; name = "freeswitch-1.6.20";
@ -20,7 +23,7 @@ stdenv.mkDerivation rec {
openssl ncurses curl gnutls readline perl libjpeg openssl ncurses curl gnutls readline perl libjpeg
sqlite pcre speex ldns libedit yasm which lua libopus sqlite pcre speex ldns libedit yasm which lua libopus
libsndfile libsndfile
]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_CFLAGS_COMPILE = "-Wno-error";
@ -31,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = https://freeswitch.org/; homepage = https://freeswitch.org/;
license = stdenv.lib.licenses.mpl11; license = stdenv.lib.licenses.mpl11;
maintainers = with stdenv.lib.maintainers; [ ]; maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; unix;
}; };
} }

View File

@ -13512,6 +13512,7 @@ in
freeswitch = callPackage ../servers/sip/freeswitch { freeswitch = callPackage ../servers/sip/freeswitch {
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
}; };
fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { };