mpv: fix build with clang 16 and on x86_64-darwin #245452
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
This fixes an issue where headers from the stdenv’s clang are being used by Swift’s clang. That does not cause issues when the stdenv on Darwin uses clang 11, but the build will fail on aarch64-darwin with a stdenv that uses clang 16 (due to changes in `arm_neon.h` that are not compatible with clang 15).
ofborg
bot
requested review from
tadeokondrak,
fpletz,
Ma27,
AndersonTorres and
globin
AndersonTorres
suggested changes
Jul 25, 2023
AndersonTorres
approved these changes
Jul 26, 2023
Swift support doesn’t seem to work with back-deployed dylibs, so set the deployment target to 10.15 to force Swift to link against the system Swift libraries. The change to use the Swift stdenv fixes the errors reported in NixOS#214944.
fpletz
approved these changes
Jul 27, 2023
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.
Description of changes
mpv was failing to build with the clang 16 stdenv because clang 16 changes
arm_neon.hin a way that’s not compatible with the clang 15 used by Swift. Switching to Swift’s stdenv fixes that problem and also allows mpv to build on x86_64-darwin. The deployment target is set to 10.15 to ensure that x86_64-darwin also uses the system Swift libraries.Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)