Skip to content

lua: add back Darwin makeBinaryWrapper fix#194389

Merged
teto merged 1 commit intoNixOS:stagingfrom
stephank:fix/darwin-lua
Oct 9, 2022
Merged

lua: add back Darwin makeBinaryWrapper fix#194389
teto merged 1 commit intoNixOS:stagingfrom
stephank:fix/darwin-lua

Conversation

@stephank
Copy link
Contributor

@stephank stephank commented Oct 4, 2022

Description of changes

It looks like #187934 broke the fix from #172749, see discussion in #189582 (comment).

Tested on master.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 4, 2022
@github-actions github-actions bot added the 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. label Oct 4, 2022
@stephank stephank mentioned this pull request Oct 4, 2022
Closed
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Oct 4, 2022
@doronbehar doronbehar requested a review from Artturin October 4, 2022 11:36
@Artturin
Copy link
Member

Artturin commented Oct 4, 2022 •
edited
Loading

I had intended to move it from the override to the wrapper.nix so splicing will work correctly, but I forgot to add it there.

@stephank
Copy link
Contributor Author

stephank commented Oct 4, 2022

An argument was made here to keep it as an override: #172749 (comment)

@doronbehar doronbehar requested a review from teto October 8, 2022 14:35
@teto teto merged commit 2623fc4 into NixOS:staging Oct 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Artturin Artturin Awaiting requested review from Artturin

@teto teto Awaiting requested review from teto

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@stephank @Artturin @teto