public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lua wrapper: Fix bash error

Browse Source 
Recently, we made it harder for external code to use some stdenv-only bash
variables by unsetting them in [1] But Lua's `withPackages` was sourcing some
setup hooks in [2], which required those bash variables.

I say great! We caught something bad: Lua should use normal dependencies, even
though that is harder with `buildEnv`. Now it works that way, and everything is
fine.

[1]: 9d3911f806/pkgs/stdenv/generic/setup.sh (L574-L578)

[2]: 9d3911f806/pkgs/development/interpreters/lua-5/wrapper.nix (L23-L27)

CC @matthewbauer
This commit is contained in:
John Ericson 2019-11-22 19:43:17 -05:00
parent 39ecc2db19
commit a610a38cb5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/lua-5/wrapper.nix
View File

@ -11,7 +11,7 @@
let let
env = let env = let
paths = requiredLuaModules (extraLibs ++ [ lua ] ); paths = requiredLuaModules (extraLibs ++ [ lua ] );
in buildEnv { in (buildEnv {
name = "${lua.name}-env"; name = "${lua.name}-env";
inherit paths; inherit paths;
@ -20,12 +20,6 @@ let
# we create wrapper for the binaries in the different packages # we create wrapper for the binaries in the different packages
postBuild = '' postBuild = ''
. "${makeWrapper}/nix-support/setup-hook"
# get access to lua functions
. ${lua}/nix-support/setup-hook
if [ -L "$out/bin" ]; then if [ -L "$out/bin" ]; then
unlink "$out/bin" unlink "$out/bin"
fi fi
@ -68,5 +62,8 @@ let
''; '';
}; };
}; };
}; }).overrideAttrs (_: {
# Add extra deps needed for postBuild hook.
nativeBuildInputs = [ makeWrapper lua ];
});
in env in env