From 665732d8779f7edbbc05f7e2428da4f40abcc3a8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 15 May 2021 14:40:26 +0000 Subject: [PATCH] lua: fix linkage This fixes a couple of problems: * Lua 5.1 doesn't have SYSLIBS, so wasn't being linked with any libraries. * SYSLIBS doesn't include -lm, so we had to add that manually to pkgconfig. LIBS includes -lm, so we don't need that hack any more. --- pkgs/development/interpreters/lua-5/interpreter.nix | 2 +- pkgs/development/interpreters/lua-5/lua-dso.make | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 506f9ca7207a..fd8c47d751b3 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -93,7 +93,7 @@ self = stdenv.mkDerivation rec { Description: An Extensible Extension Language Version: ${version} Requires: - Libs: -L$out/lib -llua -lm + Libs: -L$out/lib -llua Cflags: -I$out/include EOF ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc" diff --git a/pkgs/development/interpreters/lua-5/lua-dso.make b/pkgs/development/interpreters/lua-5/lua-dso.make index 11ac71fd8197..19c57685677d 100644 --- a/pkgs/development/interpreters/lua-5/lua-dso.make +++ b/pkgs/development/interpreters/lua-5/lua-dso.make @@ -1,4 +1,4 @@ $(LUA_SO): $(CORE_O) $(LIB_O) - $(CC) -shared $(SYSLIBS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(MYLDFLAGS) + $(CC) -shared $(LIBS) -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? $(MYLDFLAGS) ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ln -sf $(LUA_SO).$(R) $(LUA_SO)