From 0f6ddea2ff3b20c536b1530f66ee306014b39d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 7 Mar 2024 16:11:40 +0100 Subject: [PATCH] Revert #289135: lua*: support relative modules even when there are system modules This reverts commit ca6452f8edba8aaf9252b692ac821f1313ec9e7a. Regressions appeared and they need time to get resolved; see: https://github.com/NixOS/nixpkgs/pull/289135#issuecomment-1978270396 --- pkgs/development/interpreters/lua-5/hooks/setup-hook.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh index f5843d888247..1c445b82afde 100644 --- a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh @@ -22,11 +22,6 @@ addToLuaSearchPathWithCustomDelimiter() { # export only if we haven't already got this dir in the search path if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi - # if the path variable has not yet been set, initialize it to ";;" - # this is a magic value that will be replaced by the default, - # allowing relative modules to be used even when there are system modules. - if [[ -v "${varName}" ]]; then export "${varName}=;;"; fi - export "${varName}=${!varName:+${!varName};}${absPattern}" }