summaryrefslogtreecommitdiffstats
path: root/krebs/5pkgs/simple
diff options
context:
space:
mode:
authorlassulus <lass@blue.r>2018-06-13 21:00:42 +0200
committerlassulus <lass@blue.r>2018-06-13 21:00:42 +0200
commit386d9849e8a4a1aaa16c7055049b2e925916653e (patch)
tree4506a343e95b69bb3131c4b020a50e1c87b41c3b /krebs/5pkgs/simple
parentc01b6860809fb455c060e143c596590f61fc62c5 (diff)
parent5535353e8691cf95f63365f79a16752d7be457fb (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs/simple')
-rw-r--r--krebs/5pkgs/simple/ejabberd/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/krebs/5pkgs/simple/ejabberd/default.nix b/krebs/5pkgs/simple/ejabberd/default.nix
index 9e4ed3df5..b4ab13b43 100644
--- a/krebs/5pkgs/simple/ejabberd/default.nix
+++ b/krebs/5pkgs/simple/ejabberd/default.nix
@@ -1,6 +1,5 @@
{ 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
@@ -106,7 +105,7 @@ in stdenv.mkDerivation rec {
postInstall = ''
sed -i \
-e '2iexport PATH=${ctlpath}:$PATH' \
- -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \
+ -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \
-e 's,\(^ *JOT=\).*,\1,' \
-e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
$out/sbin/ejabberdctl