mbrola: Fix compilation on Darwin#376876
Merged
bjornfor merged 1 commit intoNixOS:masterfrom Jan 26, 2025
Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 11-100
Contributor
Author
|
bjornfor
approved these changes
Jan 26, 2025
Contributor
bjornfor
left a comment
bjornfor
left a comment
There was a problem hiding this comment.
LGTM.
Nit: s/liek/like/ typo in commit message.
wegank
added
the
12.approvals: 1
It looks like mbrola hasn't done a release in 6 years or so. In that time, they have a few fixes for compiling on Darwin. However, picking up those changes would require us to start packaging the latest git which is unreleased. I tried grabbing the relevant patches, but they don't seem to apply cleanly. So, instead, I just made some tweaks to the files to get things to compile using substituteInPlace. The first thing we patch is that the Makefile requests the "O6" optimization level - which does not exist in gcc or clang - but is an error in clang. The second thing is that the project attempts to re-define the "swab" function from unistd.h. Which maybe was necessary in the past, but now is an error.
Contributor
Author
|
Thanks, @bjornfor ! I updated the commit message to fix the typo. |
Contributor
|
Contributor
Already broken on the base branch. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It looks like mbrola hasn't done a release in 6 years or so. In that time, they have a few fixes for compiling on Darwin. However, picking up those changes would require us to start packaging the latest git which is unreleased. I tried grabbing the relevant patches, but they don't seem to apply cleanly. So, instead, I just made some tweaks to the files to get things to compile using substituteInPlace.
The first thing we patch is that the Makefile requests the "O6"
optimization level - which does not exist in gcc or clang - but is an
error in clang.
The second thing is that the project attempts to re-define the "swab"
function from unistd.h. Which maybe was necessary in the past, but now
is an error.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.