diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-23 12:38:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 12:38:44 -0500 |
| commit | 505dcb3b7328e2ef377a889f400a5b5ad8fc85c0 (patch) | |
| tree | a2f07e312e3e0f1582801a48b8d4db768a5d3542 /pkgs/development/interpreters/lua-5 | |
| parent | 2b66f562e9f2528ed7c3d2a9910e83912ea24a9a (diff) | |
| parent | a610a38cb5909e40d47e2c54b4f06c6226594158 (diff) | |
Merge pull request #73946 from Ericson2314/fix-lua-env
lua wrapper: Fix bash error
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/wrapper.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 816744e61cff..53ec2baeb5e5 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -11,7 +11,7 @@ let env = let paths = requiredLuaModules (extraLibs ++ [ lua ] ); - in buildEnv { + in (buildEnv { name = "${lua.name}-env"; inherit paths; @@ -20,12 +20,6 @@ let # we create wrapper for the binaries in the different packages postBuild = '' - - . "${makeWrapper}/nix-support/setup-hook" - - # get access to lua functions - . ${lua}/nix-support/setup-hook - if [ -L "$out/bin" ]; then unlink "$out/bin" fi @@ -68,5 +62,8 @@ let ''; }; }; - }; + }).overrideAttrs (_: { + # Add extra deps needed for postBuild hook. + nativeBuildInputs = [ makeWrapper lua ]; + }); in env |