diff options
| author | Matthieu Coudron <mcoudron@hotmail.com> | 2021-08-16 17:44:40 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mcoudron@hotmail.com> | 2021-08-31 00:07:28 +0200 |
| commit | 15e5c924959cc2e8398737b69fbeb7b2082a836a (patch) | |
| tree | 7c3e9fc65b6a91e47f2361e5fff96dd30f4ef811 /pkgs/development/interpreters | |
| parent | 7292ed91df14abc1d9b55322b5d112a9b34af6c7 (diff) | |
luaPackages: update
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/build-lua-package.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix index 02c92cc51170..8c9204c0b288 100644 --- a/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -74,7 +74,7 @@ version # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. let - generatedRockspecFilename = "${pname}-${version}.rockspec"; + generatedRockspecFilename = "${rockspecDir}/${pname}-${version}.rockspec"; # TODO fix warnings "Couldn't load rockspec for ..." during manifest @@ -169,16 +169,17 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab inherit rocksSubdir; # enabled only for src.rock - setSourceRoot= let - # name_only= lib.getName name; - name_only= pname; - in - lib.optionalString (knownRockspec == null) '' - # format is rockspec_basename/source_basename - # rockspec can set it via spec.source.dir - folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) - sourceRoot="$folder" - ''; + # setSourceRoot= let + # # name_only= lib.getName name; + # name_only= pname; + # in + # # if this is a rockFile + # lib.optionalString (knownRockspec == null ) '' + # # format is rockspec_basename/source_basename + # # rockspec can set it via spec.source.dir + # folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) + # sourceRoot="$folder" + # ''; configurePhase = '' runHook preConfigure @@ -187,6 +188,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab ${luarocks_content} EOF export LUAROCKS_CONFIG="$PWD/${luarocks_config}"; + echo "pwd: $PWD" '' + lib.optionalString (rockspecFilename == null) '' |