fix lua53Packages.lua

This commit is contained in:
Will Dietz 2019-04-27 13:28:54 -05:00
parent 753e1e0bab
commit 4e09baaaa2
2 changed files with 7 additions and 3 deletions

View File

@ -15,11 +15,10 @@ let
in rec {
lua5_3 = (callPackage ./interpreter.nix {
lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ;
}).overrideAttrs( oa: {
postConfigure = lib.optionalString (!stdenv.isDarwin) ''
cat ${./lua-5.3-dso.make} >> src/Makefile
sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
@ -28,7 +27,7 @@ in rec {
postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
'';
});
};
lua5_3_compat = lua5_3.override({
compat = true;

View File

@ -5,6 +5,8 @@
, sourceVersion
, hash
, patches ? []
, postConfigure ? null
, postBuild ? null
}:
let
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
@ -52,6 +54,9 @@ self = stdenv.mkDerivation rec {
runHook postConfigure
'';
inherit postConfigure;
inherit postBuild;
postInstall = ''
mkdir -p "$out/share/doc/lua" "$out/lib/pkgconfig"