diff options
author | Matthieu Coudron <mcoudron@hotmail.com> | 2021-08-31 22:15:04 +0200 |
---|---|---|
committer | Matthieu Coudron <mcoudron@hotmail.com> | 2021-08-31 22:16:28 +0200 |
commit | e62a0eac8f2cfe58efae9200f9d267169f519cab (patch) | |
tree | 2fe75446222638111a7db11f3b862a72336b1ef5 /pkgs/development/interpreters | |
parent | 1d22aed0417ef945552d4dc2abcf04e806162351 (diff) |
buildLuarocksPackage: cleanup
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/lua-5/build-lua-package.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 8ff70cef3ba2..5639b2a4bb90 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -7,10 +7,8 @@ }: { -# name ? "${attrs.pname}-${attrs.version}" -pname, - -version +pname +, version # by default prefix `name` e.g. "lua5.2-${name}" , namePrefix ? if lua.pkgs.isLuaJIT @@ -62,7 +60,7 @@ version # relative to srcRoot, path to the rockspec to use when using rocks , rockspecFilename ? null - # "../*.rockspec" +# relative to srcRoot, path to folder that contains the expected rockspec , rockspecDir ? "." # must be set for packages that don't have a rock @@ -174,8 +172,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab ${luarocks_content} EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; - echo "pwd: $PWD" - '' + lib.optionalString (rockspecFilename == null) '' rockspecFilename="${generatedRockspecFilename}" |