2 files changed, 11 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
index 2cf4d9465aec..f6a8f658039b 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
-, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
+, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
 , flock
 , withMysql ? false
 , withPgsql ? false
@@ -21,7 +21,7 @@ let
     fi
   '';
 
-  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
+  ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
 
 in stdenv.mkDerivation rec {
   version = "20.03";
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
index c9cd09bb748d..9b7ed2ac41d0 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/xmpp/prosody/default.nix
@@ -59,6 +59,10 @@ stdenv.mkDerivation rec {
     "--with-lua=${lua5}"
   ];
 
+  postBuild = ''
+    make -C tools/migration
+  '';
+
   postInstall = ''
       ${concatMapStringsSep "\n" (module: ''
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
@@ -70,6 +74,11 @@ stdenv.mkDerivation rec {
         --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \
         --prefix LUA_PATH ';' "$LUA_PATH" \
         --prefix LUA_CPATH ';' "$LUA_CPATH"
+
+      make -C tools/migration install
+      wrapProgram $out/bin/prosody-migrator \
+        --prefix LUA_PATH ';' "$LUA_PATH" \
+        --prefix LUA_CPATH ';' "$LUA_CPATH"
     '';
 
   passthru = {