diff options
| -rw-r--r-- | pkgs/development/lua-modules/generic/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 1 |
2 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index f5ea77c2f14..2a44cdfca0b 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -2,22 +2,23 @@ lua: { buildInputs ? [], disabled ? false, ... } @ attrs: -assert !disabled; +if disabled then + throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" +else + lua.stdenv.mkDerivation ({ -lua.stdenv.mkDerivation ({ - - preBuild = '' - makeFlagsArray=( - PREFIX=$out - LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" - LUA_INC="-I${lua}/include"); - ''; - } - // - attrs - // - { - name = "lua${lua.luaversion}-" + attrs.name; - buildInputs = buildInputs ++ [ lua ]; - } -) + preBuild = '' + makeFlagsArray=( + PREFIX=$out + LUA_LIBDIR="$out/lib/lua/${lua.luaversion}" + LUA_INC="-I${lua}/include"); + ''; + } + // + attrs + // + { + name = "lua${lua.luaversion}-" + attrs.name; + buildInputs = buildInputs ++ [ lua ]; + } + ) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 88216413576..2e52056df33 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,6 @@ {fetchurl, stdenv, lua}: let self = _self; _self = with self; { - inherit (stdenv.lib) maintainers; #define build lua package function |