diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-25 23:01:31 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-26 17:40:55 -0500 |
commit | ce8ce600ae41d3899e4a556fa9ff8a1a34374063 (patch) | |
tree | 3ea6538af9f648999a7a68cb44818c52f33963c6 /pkgs/servers/xmpp | |
parent | 675dc1bfbfd87c02c8588d78ffc903fb6987f6e4 (diff) |
unix-tools: introduce unix-tools.nix
unix-tools.nix has a collection of tools that are commonly installed by default in Unix derivatives. This is intended to provide compatibility between macOS and Linux users. Three Linux-only derivations are provided for compatbility: - procps - utillinux - nettools More tools are also provided. Also: treewide: use unixtools Non-comprehensive replace of Linux-only procps and util-linux with 'unixtools'.
Diffstat (limited to 'pkgs/servers/xmpp')
-rw-r--r-- | pkgs/servers/xmpp/biboumi/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index f46b3189edfe1..7ef6242d2b25e 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, cmake, libuuid, expat, sqlite, libidn, - libiconv, botan2, systemd, pkgconfig, udns, pandoc, procps } : + libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } : stdenv.mkDerivation rec { name = "biboumi-${version}"; @@ -20,12 +20,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig pandoc ]; buildInputs = [ libuuid expat sqlite libiconv libidn botan2 systemd - udns procps ]; + udns ]; - inherit procps; preConfigure = '' substituteInPlace CMakeLists.txt --replace /etc/biboumi $out/etc/biboumi - substituteInPlace unit/biboumi.service.cmake --replace /bin/kill $procps/bin/kill + substituteInPlace unit/biboumi.service.cmake --replace /bin/kill ${coreutils}/bin/kill cp $louiz_catch/single_include/catch.hpp tests/ # echo "policy_directory=$out/etc/biboumi" >> conf/biboumi.cfg # TODO include conf/biboumi.cfg as example somewhere diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index cd27f69e5f4b1..f95b5efe3d38c 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -1,5 +1,6 @@ { stdenv, writeScriptBin, lib, fetchurl, git, cacert , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd +, flock , withMysql ? false , withPgsql ? false , withSqlite ? false, sqlite @@ -101,7 +102,7 @@ in stdenv.mkDerivation rec { postInstall = '' sed -i \ -e '2iexport PATH=${ctlpath}:$PATH' \ - -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \ + -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \ -e 's,\(^ *JOT=\).*,\1,' \ -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl |