diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2018-08-05 18:02:40 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-05 18:02:40 +0200 |
| commit | 8910795eee38963d97a637a159e209617c41905b (patch) | |
| tree | edbc20c12f3c19d0b05f7b8c4ba6a82fc19639f1 /pkgs/servers/xmpp | |
| parent | 6b0234942be92401aca81a2d2b5d21fdcec45c19 (diff) | |
ejabberd: 18.01 -> 18.06 (#44158)
ejabberd switched from imagemagick to eimp, which loads libpng, libjpeg and libwebp at runtime. These were therefore added as dependencies and the relevant binary was wrapped to be able to find them.
Diffstat (limited to 'pkgs/servers/xmpp')
| -rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 6a0bedeab260e..1436af024cd79 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScriptBin, lib, fetchurl, git, cacert +{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd , flock , withMysql ? false @@ -24,17 +24,17 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "18.01"; + version = "18.06"; name = "ejabberd-${version}"; src = fetchurl { url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6"; + sha256 = "1c4h6qrckihm8v4vm52h31j5dxg7247vk374rwz41idfb25vx7dc"; }; nativeBuildInputs = [ fakegit ]; - buildInputs = [ erlang openssl expat libyaml gd ] + buildInputs = [ erlang openssl expat libyaml gd makeWrapper ] ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1v3h0c7kfifb6wsfxyv5j1wc7rlxbb7r0pgd4s340wiyxnllzzhk"; + outputHash = "1bk3yd10cq6vlgmh2qawl82m29yi5zcbsdlz17xyy76sg2ka622a"; }; configureFlags = @@ -106,6 +106,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl + wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libpng libjpeg libwebp ]}" ''; meta = with stdenv.lib; { |