diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index efa5d1c2d5a0..fb709227180f 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -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; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 29e1e4cf21c8..26db917c9002 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -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"