@@ -280,34 +280,47 @@ with prev;
280280 '';
281281 });
282282
283− luv = prev.lib.overrideLuarocks prev.luv (drv: {
284− # Use system libuv instead of building local and statically linking
285− # This is a hacky way to specify -DWITH_SHARED_LIBUV=ON which
286− # is not possible with luarocks and the current luv rockspec
287− # While at it, remove bundled libuv source entirely to be sure.
288− # We may wish to drop bundled lua submodules too...
289− preBuild = ''
290− sed -i 's,\(option(WITH_SHARED_LIBUV.*\)OFF,\1ON,' CMakeLists.txt
291− rm -rf deps/libuv
292− '';
293283
294− buildInputs = [ pkgs.libuv ];
284+ # as advised in https://github.com/luarocks/luarocks/issues/1402
285+ # we shouldn't use luarocks machinery to build complex cmake components
286+ libluv = pkgs.stdenv.mkDerivation {
287+
288+ inherit (prev.luv) pname version meta src;
289+
290+ cmakeFlags = [
291+ "-DBUILD_SHARED_LIBS=ON"
292+ "-DBUILD_MODULE=OFF"
293+ "-DWITH_SHARED_LIBUV=ON"
294+ ];
295+
296+ buildInputs = [ pkgs.libuv ];
297+
298+ nativeBuildInputs = [ pkgs.pkg-config pkgs.fixDarwinDylibNames pkgs.cmake ];
299+ # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
300+ NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
301+ (if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
302+ };
295303
296− passthru = {
297− libluv = final.luv.overrideAttrs (oa: {
298− preBuild = final.luv.preBuild + ''
299− sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
300− sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
301− sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
302− '';
304+ luv = prev.lib.overrideLuarocks prev.luv (drv: {
305+
306+ buildInputs = [ pkgs.pkg-config pkgs.libuv ];
303307
304− nativeBuildInputs = [ pkgs.fixDarwinDylibNames ];
308+ doInstallCheck = true;
305309
306− # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
307− NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
308− (if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
309− });
310+ # Use system libuv instead of building local and statically linking
311+ extraVariables = {
312+ "WITH_SHARED_LIBUV" = "ON";
310313 };
314+
315+ # we unset the LUA_PATH since the hook erases the interpreter defaults (To fix)
316+ installCheckPhase = ''
317+ unset LUA_PATH
318+ rm tests/test-{dns,thread}.lua
319+ lua tests/run.lua
320+ '';
321+
322+ passthru.libluv = final.libluv;
323+
311324 });
312325
313326 lyaml = prev.lib.overrideLuarocks prev.lyaml (oa: {