From 399223fdf7d9815ae107f5046187ee16818727ba Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 15 May 2021 14:07:14 +0000 Subject: [PATCH] Revert "lua5_*: tweak linking libraries" This reverts commit 539ad4f81140545b60e0d5aba55d36ef02ebebba. The correct fix here is to fix our addition to the Makefile. --- pkgs/development/interpreters/lua-5/interpreter.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 4c45a3c6bdd..506f9ca7207 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -72,8 +72,6 @@ self = stdenv.mkDerivation rec { ''; inherit postConfigure; - NIX_LDFLAGS = [ "-lm" ] ++ lib.optional (lib.versionOlder luaversion "5.2") "-ldl"; - inherit postBuild; postInstall = '' @@ -95,7 +93,7 @@ self = stdenv.mkDerivation rec { Description: An Extensible Extension Language Version: ${version} Requires: - Libs: -L$out/lib -llua + Libs: -L$out/lib -llua -lm Cflags: -I$out/include EOF ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"