diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-27 13:28:54 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-04-27 13:39:43 -0500 |
| commit | 4e09baaaa278f9697df50546d1a71d1fae294f4e (patch) | |
| tree | 1c6273a583de28068e0646478fa5f2e8a4d91c73 /pkgs | |
| parent | 753e1e0babd1d22677f08ae59c9322cd63de24d5 (diff) | |
| download | nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar.gz nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar.bz2 nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar.lz nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar.xz nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.tar.zst nixpkgs-4e09baaaa278f9697df50546d1a71d1fae294f4e.zip | |
fix lua53Packages.lua
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/interpreter.nix | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index efa5d1c2d5a..fb709227180 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 29e1e4cf21c..26db917c900 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" |