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

Merge pull request #60340 from dtzWill/fix/lua53

Browse Source 
fix lua53Packages.lua
This commit is contained in:
Matthieu Coudron 2019-04-28 16:48:38 +09:00 committed by GitHub
commit d0bac7debc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/lua-5/default.nix
View File

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

5
pkgs/development/interpreters/lua-5/interpreter.nix
View File

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