From 7fea091aa812b0755fd1d80cac4da679192cd852 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 25 Jan 2025 17:03:49 +0100
Subject: [PATCH] {lua-5,luajit}: fix missing @ lua @ reference in utils.sh

---
 pkgs/development/interpreters/lua-5/interpreter.nix | 5 ++---
 pkgs/development/interpreters/lua-5/utils.sh        | 7 +------
 pkgs/development/interpreters/luajit/default.nix    | 5 ++---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 54435308d1c1..02868d749fa6 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -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;
         }
diff --git a/pkgs/development/interpreters/lua-5/utils.sh b/pkgs/development/interpreters/lua-5/utils.sh
index 2365af08dc9c..50b627004203 100644
--- a/pkgs/development/interpreters/lua-5/utils.sh
+++ b/pkgs/development/interpreters/lua-5/utils.sh
@@ -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
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 147884c59f01..88d318b207b3 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -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;
       }