From cb8b6b5b792f60406555e0d85ad6188a21439510 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 6 Jan 2020 15:25:04 +0100
Subject: ...

---
 customized/prosody.nix | 4 ++--
 ymir.nix               | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/customized/prosody.nix b/customized/prosody.nix
index f8633742..a30b4e16 100644
--- a/customized/prosody.nix
+++ b/customized/prosody.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
 , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luadbi ? null
-, withLibevent ? true, withZlib ? true, withDBI ? true
+, withLibevent ? true, withDBI ? true
 , withCommunityModules ? [], extraLibs ? [], extraModules ? []
 }:
 
@@ -12,7 +12,7 @@ with stdenv.lib;
 let
   libs             = [ luasocket luasec luaexpat luafilesystem luabitop ]
                      ++ optional withLibevent luaevent
-                     ++ optional withZlib luazlib
+                     ++ optional withDBI luadbi;
                      ++ extraLibs;
   getPath          = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
   getLuaPath       = lib : getPath lib "lua";
diff --git a/ymir.nix b/ymir.nix
index bcfadf03..e2190b57 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -69,11 +69,11 @@ in rec {
   nixpkgs.overlays = [
     (self: super: {
       prosody = self.callPackage ./customized/prosody.nix ({
-          inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi;
-          lua5 = pkgs.lua5_1;
+          inherit (self.lua52Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi;
+          lua5 = pkgs.lua5_2_compat;
           withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"];
           extraModules = [prosodyAuth];
-          extraLibs = [luaPam luaPosix luaSha2];
+          extraLibs = with self.lua52Packages; [luaPam luaPosix luaSha2 lua-zlib];
         });
       # uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
       #   extraPlugins = {
-- 
cgit v1.2.3