ejabberd: drop broken elixir support

This commit is contained in:
Jörg Thalheim 2021-07-01 08:28:35 +02:00
parent f04448c805
commit 82973506ac
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4

View file

@ -7,7 +7,6 @@
, withPam ? false, pam , withPam ? false, pam
, withZlib ? true, zlib , withZlib ? true, zlib
, withRiak ? false , withRiak ? false
, withElixir ? false, elixir
, withIconv ? true , withIconv ? true
, withTools ? false , withTools ? false
, withRedis ? false , withRedis ? false
@ -38,11 +37,7 @@ in stdenv.mkDerivation rec {
++ lib.optional withSqlite sqlite ++ lib.optional withSqlite sqlite
++ lib.optional withPam pam ++ lib.optional withPam pam
++ lib.optional withZlib zlib ++ lib.optional withZlib zlib
++ lib.optional withElixir elixir ;
;
# Apparently needed for Elixir
LANG = "en_US.UTF-8";
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "ejabberd-deps"; pname = "ejabberd-deps";
@ -52,7 +47,7 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ]; nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ];
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
@ -86,7 +81,6 @@ in stdenv.mkDerivation rec {
(lib.enableFeature withPam "pam") (lib.enableFeature withPam "pam")
(lib.enableFeature withZlib "zlib") (lib.enableFeature withZlib "zlib")
(lib.enableFeature withRiak "riak") (lib.enableFeature withRiak "riak")
(lib.enableFeature withElixir "elixir")
(lib.enableFeature withIconv "iconv") (lib.enableFeature withIconv "iconv")
(lib.enableFeature withTools "tools") (lib.enableFeature withTools "tools")
(lib.enableFeature withRedis "redis") (lib.enableFeature withRedis "redis")
@ -97,7 +91,7 @@ in stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
cp -r $deps deps cp -r $deps deps
chmod -R +w deps chmod -R +w deps
patchShebangs deps patchShebangs .
''; '';
postInstall = '' postInstall = ''
@ -108,6 +102,7 @@ in stdenv.mkDerivation rec {
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
$out/sbin/ejabberdctl $out/sbin/ejabberdctl
wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}"
rm $out/bin/{mix,iex,elixir}
''; '';
meta = with lib; { meta = with lib; {
@ -116,6 +111,5 @@ in stdenv.mkDerivation rec {
homepage = "https://www.ejabberd.im"; homepage = "https://www.ejabberd.im";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ sander abbradar ]; maintainers = with maintainers; [ sander abbradar ];
broken = withElixir;
}; };
} }