{lua-5,luajit}: fix missing @ lua @ reference in utils.sh

This commit is contained in:
Wolfgang Walther
2025-01-26 16:47:16 +01:00
parent a8f509677f
commit 7fea091aa8
3 changed files with 5 additions and 12 deletions
@@ -7,7 +7,7 @@
makeWrapper,
self,
packageOverrides ? (final: prev: { }),
substituteAll,
replaceVars,
pkgsBuildBuild,
pkgsBuildHost,
pkgsBuildTarget,
@@ -149,8 +149,7 @@ stdenv.mkDerivation (
postInstall = ''
mkdir -p "$out/nix-support" "$out/share/doc/lua" "$out/lib/pkgconfig"
cp ${
substituteAll {
src = ./utils.sh;
replaceVars ./utils.sh {
luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths;
luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths;
}
+1 -6
View File
@@ -118,15 +118,10 @@ buildLuaPath() {
echo "BUILD_LUA_PATH"
# # set -x
# # Create an empty table of paths (see doc on loadFromPropagatedInputs
# # for how this is used). Build up the program_PATH and program_LUA_PATH
# # variables.
# declare -gA luaPathsSeen=()
# # for how this is used). Build up the program_PATH variable.
# # shellcheck disable=SC2034
program_PATH=
luaPathsSeen["@lua@"]=1
# addToSearchPath program_PATH @lua@/bin
for path in $luaPath; do
_addToLuaPath "$path"
done
@@ -4,7 +4,7 @@
buildPackages,
version,
src,
substituteAll,
replaceVars,
extraMeta ? { },
self,
packageOverrides ? (final: prev: { }),
@@ -102,8 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
mkdir -p $out/nix-support
cp ${
substituteAll {
src = ../lua-5/utils.sh;
replaceVars ../lua-5/utils.sh {
luapathsearchpaths = lib.escapeShellArgs finalAttrs.LuaPathSearchPaths;
luacpathsearchpaths = lib.escapeShellArgs finalAttrs.LuaCPathSearchPaths;
}