From 10237c8584abba54df0f2765d250cad551e26882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 May 2019 10:57:13 +0200 Subject: [PATCH] lua*Packages.compat53: improve paths Test case that should execute without an error: echo "require('compat53')" | env NIX_PATH=nixpkgs=$(pwd) \ nix-shell --pure -p lua -p lua.pkgs.compat53 --run lua --- pkgs/top-level/lua-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index b51af519f93..0b7ba9dfd61 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -151,10 +151,11 @@ with self; { cc lutf8lib.c $CFLAGS -o utf8.so ''; - # There's no need to separate *.lua and *.so, I guess? TODO: conventions? + # The hook in ../development/lua-modules/generic/default.nix + # is strict about share vs. lib for _PATH and _CPATH. installPhase = '' - install -Dt "$out/lib/lua/${lua.luaversion}/compat53" \ - compat53/*.lua *.so + install -Dt "$out/share/lua/${lua.luaversion}/compat53" compat53/*.lua + install -Dt "$out/lib/lua/${lua.luaversion}/compat53" *.so ''; meta = with stdenv.lib; {