mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
[Backport release-26.05] dovecot: Fix building with Lua (#542490)
This commit is contained in:
28
pkgs/by-name/do/dovecot/fix-lua-build.patch
Normal file
28
pkgs/by-name/do/dovecot/fix-lua-build.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
|
||||
index 7474e76fb6..e7fc4aad0f 100644
|
||||
--- a/src/auth/Makefile.am
|
||||
+++ b/src/auth/Makefile.am
|
||||
@@ -21,12 +21,11 @@ LUA_LIB =
|
||||
AUTH_LUA_LIBS =
|
||||
AUTH_LUA_LDADD =
|
||||
if HAVE_LUA
|
||||
-
|
||||
+AUTH_LUA_LDADD += $(LUA_LIBS)
|
||||
if AUTH_LUA_PLUGIN
|
||||
LUA_LIB += libauthdb_lua.la
|
||||
else
|
||||
AUTH_LUA_LIBS += $(LIBDOVECOT_LUA)
|
||||
-AUTH_LUA_LDADD += $(LUA_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -200,7 +199,7 @@ endif
|
||||
endif
|
||||
|
||||
if HAVE_LUA
|
||||
-auth_libs += $(LIBDOVECOT_LUA) $(LUA_LIBS)
|
||||
+auth_libs += $(LIBDOVECOT_LUA)
|
||||
endif
|
||||
|
||||
if AUTH_LUA_PLUGIN
|
||||
|
||||
@@ -78,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
bison
|
||||
perl
|
||||
pkg-config
|
||||
autoreconfHook
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]
|
||||
++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config;
|
||||
|
||||
buildInputs = [
|
||||
@@ -125,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
|
||||
env = {
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
|
||||
LUA_PATH = lib.optionalString withLua "${lua5_3.pkgs.json}/share/lua/${lua5_3.luaversion}/?.lua";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -E \
|
||||
|
||||
@@ -4,5 +4,6 @@ import ./generic.nix {
|
||||
patches = _: [
|
||||
# Fix loading extended modules.
|
||||
./load-extended-modules.patch
|
||||
./fix-lua-build.patch
|
||||
];
|
||||
}
|
||||
|
||||
34
pkgs/development/lua-modules/json/default.nix
Normal file
34
pkgs/development/lua-modules/json/default.nix
Normal file
@@ -0,0 +1,34 @@
|
||||
{
|
||||
buildLuaPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
lua,
|
||||
}:
|
||||
|
||||
buildLuaPackage rec {
|
||||
pname = "json";
|
||||
version = "0.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rxi";
|
||||
repo = "json.lua";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JSKMxF5NSHW3QaELFPWm1sx7kHmOXEPsUkM3i/px7Gk=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/lua/${lua.luaversion}
|
||||
cp -r json.lua $out/share/lua/${lua.luaversion}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/rxi/json.lua";
|
||||
description = "A lightweight JSON library for Lua";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -113,6 +113,8 @@ rec {
|
||||
|
||||
image-nvim = callPackage ../development/lua-modules/image-nvim { };
|
||||
|
||||
json = callPackage ../development/lua-modules/json { };
|
||||
|
||||
lua-https = callPackage ../development/lua-modules/lua-https { };
|
||||
|
||||
lua-pam = callPackage (
|
||||
|
||||
Reference in New Issue
Block a user