Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 322ec24acd41
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 539ad4f81140
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 15, 2021

  1. lua5_*: tweak linking libraries 

    All liblua.so were missing a library or two;
I'm not sure if there's a better way to add them.  Check:
ldd -r ./result/lib/liblua.so
    @vcunat
    vcunat committed May 15, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    539ad4f View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/development/interpreters/lua-5/interpreter.nix
4 changes: 3 additions & 1 deletion pkgs/development/interpreters/lua-5/interpreter.nix
View file
Original file line number Diff line number Diff line change
@@ -72,6 +72,8 @@ self = stdenv.mkDerivation rec {
'';
inherit postConfigure;

NIX_LDFLAGS = [ "-lm" ] ++ lib.optional (lib.versionOlder luaversion "5.2") "-ldl";

inherit postBuild;

postInstall = ''
@@ -93,7 +95,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"