Merge pull request #69635 from marsam/fix-z-lua-darwin

z-lua: fix build on darwin
NixOS · Sep 27, 2019 · 9c1eb7a · 9c1eb7a
2 parents afd6b04 + 0f1ce17
commit 9c1eb7a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lua }:
+{ stdenv, fetchFromGitHub, lua52Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
@@ -13,10 +13,17 @@ stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  buildInputs = [ (lua.withPackages (p: with p; [ luafilesystem ])) ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ lua52Packages.lua ];
 
   installPhase = ''
+    runHook preInstall
+
     install -Dm755 z.lua $out/bin/z
+    wrapProgram $out/bin/z --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1;
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {