Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lua: Add more symlinks to lua.pc #110616

Merged
merged 1 commit into from Jan 24, 2021
Merged

lua: Add more symlinks to lua.pc #110616

merged 1 commit into from Jan 24, 2021

Conversation

jakobrs
Copy link
Contributor

@jakobrs jakobrs commented Jan 23, 2021

Motivation for this change

This is essentially a continuation of #42473. Some packages expect lua53.pc to exist, but Nixpkgs currently only has lua.pc and lua5.3.pc. This creates a symlink to lua.pc for every name of the file used by Arch.

For a version of Lua (for example, 5.4) there are now:

  • lib/pkgconfig/lua.pc
  • lib/pkgconfig/lua-5.4.pc
  • lib/pkgconfig/lua5.4.pc
  • lib/pkgconfig/lua54.pc

Compare the names used by Arch and Debian.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@SuperSandro2000
Copy link
Member

Do we want to move this through staging?

ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${stdenv.lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${stdenv.lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"

@teto
Copy link
Member

teto commented Jan 23, 2021

the comparison with arch/debian is much appreciated. Fix @SuperSandro2000 's comment and I'll merge it.

This creates a symlink to lua.pc for every name of the file used by Arch:

For a version of Lua (for example, 5.4) we now have:
- lib/pkgconfig/lua.pc
- lib/pkgconfig/lua-5.4.pc
- lib/pkgconfig/lua5.4.pc
- lib/pkgconfig/lua54.pc
@jakobrs
Copy link
Contributor Author

jakobrs commented Jan 24, 2021

Done.

@teto teto merged commit 460b9f5 into NixOS:master Jan 24, 2021
@jakobrs jakobrs deleted the luapc branch January 24, 2021 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants