Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions pkgs/development/lua-modules/generic/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,27 @@
}:

{
disabled ? false,
propagatedBuildInputs ? [ ],
makeFlags ? [ ],
...
}@attrs:

if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
else
toLuaModule (
lua.stdenv.mkDerivation (
attrs
// {
name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;
toLuaModule (
lua.stdenv.mkDerivation (
attrs
// {
name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;

makeFlags = [
"PREFIX=$(out)"
"LUA_INC=-I${lua}/include"
"LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
"LUA_VERSION=${lua.luaversion}"
] ++ makeFlags;
makeFlags = [
"PREFIX=$(out)"
"LUA_INC=-I${lua}/include"
"LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"
"LUA_VERSION=${lua.luaversion}"
] ++ makeFlags;

propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook
];
}
)
propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook
];
}
)
)
7 changes: 2 additions & 5 deletions pkgs/top-level/lua-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ rec {
buildLuaPackage rec {
pname = "lua-pam";
version = "unstable-2015-07-03";
# Needed for `disabled`, overridden in buildLuaPackage
name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "devurandom";
Expand All @@ -147,10 +145,9 @@ rec {
runHook postInstall
'';

# The package does not build with lua 5.4 or luaJIT
disabled = luaAtLeast "5.4" || isLuaJIT;

meta = with lib; {
# The package does not build with lua 5.4 or luaJIT
broken = luaAtLeast "5.4" || isLuaJIT;
description = "Lua module for PAM authentication";
homepage = "https://github.com/devurandom/lua-pam";
license = licenses.mit;
Expand Down
Loading