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

Merge pull request #73946 from Ericson2314/fix-lua-env

Browse Source 
lua wrapper: Fix bash error
This commit is contained in:
John Ericson 2019-11-23 12:38:44 -05:00 committed by GitHub
commit 505dcb3b73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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