Skip to content

naev: fix the build after luajit update#391082

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:naev-luajit-fix
Mar 20, 2025
Merged

naev: fix the build after luajit update#391082
vcunat merged 1 commit intoNixOS:staging-nextfrom
trofi:naev-luajit-fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Mar 18, 2025

On staging-next naev fails the build as:

../src/lutf8lib.c: In function 'Lutf8_codepoint':
../src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
  421 |   if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
      |                      ^~~~~~~

It started after commit a69699e "luajit_2_1: 2.1.1713773202 -> 2.1.1741730670" which exposed missing include. It's already fixed upstream, but the change is a bit invasive. Let's settle on header injection.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

On `staging-next` `naev` fails the build as:

    ../src/lutf8lib.c: In function 'Lutf8_codepoint':
    ../src/lutf8lib.c:421:22: error: 'INT_MAX' undeclared (first use in this function)
      421 |   if (pose - posi >= INT_MAX)  /* (lua_Integer -> int) overflow? */
          |                      ^~~~~~~

It started after commit a69699e "luajit_2_1: 2.1.1713773202 -> 2.1.1741730670"
which exposed missing include. It's already fixed upstream, but the change is
a bit invasive. Let's settle on header injection.
@trofi
Copy link
Contributor Author

trofi commented Mar 18, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 391082


x86_64-linux

✅ 1 package built:
  • naev

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 18, 2025
@nix-owners nix-owners bot requested a review from ralismark March 18, 2025 21:13
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 19, 2025
@vcunat vcunat merged commit 1422e89 into NixOS:staging-next Mar 20, 2025
44 checks passed
@trofi trofi deleted the naev-luajit-fix branch March 20, 2025 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants