Merge pull request #43060 from disassembler/asterisk

Asterisk xmpp support
This commit is contained in:
xeji 2018-07-06 00:43:26 +02:00 committed by GitHub
commit 5c271db791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,25 @@
{ stdenv, autoreconfHook, libtool, pkgconfig, gnutls, fetchFromGitHub, texinfo }:
stdenv.mkDerivation rec {
name = "iksemel-${version}";
version = "1.4.2";
src = fetchFromGitHub {
owner = "timothytylee";
repo = "iksemel-1.4";
rev = "v${version}";
sha256 = "1xv302p344hnpxqcgs3z6wwxhrik39ckgfw5cjyrw0dkf316z9yh";
};
nativeBuildInputs = [ pkgconfig autoreconfHook libtool texinfo ];
buildInputs = [ gnutls ];
meta = with stdenv.lib; {
description = "XML parser for jabber";
homepage = https://github.com/timothytylee/iksemel-1.4;
license = licenses.gpl2;
maintainers = with maintainers; [ disassembler ];
platforms = platforms.linux;
};
}

View File

@ -2,7 +2,7 @@
jansson, libxml2, libxslt, ncurses, openssl, sqlite, jansson, libxml2, libxslt, ncurses, openssl, sqlite,
utillinux, dmidecode, libuuid, newt, utillinux, dmidecode, libuuid, newt,
lua, speex, lua, speex,
srtp, wget, curl srtp, wget, curl, iksemel
}: }:
let let
@ -10,7 +10,7 @@ let
inherit version; inherit version;
name = "asterisk-${version}"; name = "asterisk-${version}";
buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl ]; buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ];
patches = [ patches = [
# We want the Makefile to install the default /var skeleton # We want the Makefile to install the default /var skeleton

View File

@ -16620,6 +16620,8 @@ with pkgs;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
}; };
iksemel = callPackage ../development/libraries/iksemel { };
imagej = callPackage ../applications/graphics/imagej { }; imagej = callPackage ../applications/graphics/imagej { };
imagemagick_light = imagemagick.override { imagemagick_light = imagemagick.override {