diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2021-07-01 08:28:35 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2021-07-01 09:10:11 +0200 |
commit | 82973506ac1db703661dd2d767cb2adb017652af (patch) | |
tree | be89c152bdf89e15ffb3665b96ae3a14c7f28759 /pkgs/servers/xmpp | |
parent | f04448c805017d24cd61a463ed48cf135003ab3d (diff) | |
download | nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar.gz nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar.bz2 nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar.lz nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar.xz nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.tar.zst nixpkgs-82973506ac1db703661dd2d767cb2adb017652af.zip |
ejabberd: drop broken elixir support
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 25b4e8f6935..6dccb39ad2a 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -7,7 +7,6 @@ , withPam ? false, pam , withZlib ? true, zlib , withRiak ? false -, withElixir ? false, elixir , withIconv ? true , withTools ? false , withRedis ? false @@ -38,11 +37,7 @@ in stdenv.mkDerivation rec { ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib - ++ lib.optional withElixir elixir - ; - - # Apparently needed for Elixir - LANG = "en_US.UTF-8"; + ; deps = stdenv.mkDerivation { pname = "ejabberd-deps"; @@ -52,7 +47,7 @@ in stdenv.mkDerivation rec { 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"; @@ -86,7 +81,6 @@ in stdenv.mkDerivation rec { (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") (lib.enableFeature withRiak "riak") - (lib.enableFeature withElixir "elixir") (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") @@ -97,7 +91,7 @@ in stdenv.mkDerivation rec { preBuild = '' cp -r $deps deps chmod -R +w deps - patchShebangs deps + patchShebangs . ''; postInstall = '' @@ -108,6 +102,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl 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; { @@ -116,6 +111,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; - broken = withElixir; }; } |