jxrlib: fix/enable for darwin #95625
Merged
Conversation
This file contains 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
ofborg
bot
added
6.topic: darwin
Mic92
reviewed
Aug 23, 2020
| @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { | |||
| sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w"; | |||
| }; | |||
|
|
|||
| postPatch = stdenv.lib.optionalString stdenv.isDarwin '' | |||
| substituteInPlace Makefile \ | |||
| --replace '-shared' '-dynamiclib -undefined dynamic_lookup' \ | |||
There was a problem hiding this comment.
What does -dynamiclib do out of interest?
There was a problem hiding this comment.
As far as I can tell it's the darwin equivalent of -shared. -undefined dynamic_lookup makes the linker tolerate missing symbols that it assumes will be resolved by other libs at runtime.
I have no real knowledge of this, I discovered these with a lot of painful googling. As I was doing this, I was wishing that whatever macos gurus we had would write us a simple "macos for linux people" cheat sheet - it would do wonders for macos support.
But then I remembered that it'd all only apply until the big macos 11 shakeup, and who knows what the future will be after that...
|
Merging this - it's fairly harmless... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
In #92708 we're looking at unbundling libs from
freeimage, but doing so means addingjxrlibas a dependency offreeimage. Without darwin support forjxrlibthis will result in nofreeimagefor darwin. Fix this.Builds for me, macos 10.14.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)