opencv, mpv: add Accelerate framework on darwin #225378
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
No idea why aarch64-darwin started to need it now. https://hydra.nixos.org/build/215252174#tabs-buildsteps (also split long lines)
No idea why aarch64-darwin started to need it now. https://hydra.nixos.org/build/215284720#tabs-buildsteps
|
@ofborg build opencv mpv-unwrapped |
ofborg
bot
requested review from
Ma27,
tadeokondrak,
globin,
AndersonTorres,
mdaiter,
fpletz and
basvandijk
| @@ -211,7 +211,9 @@ stdenv.mkDerivation { | |||
| # tesseract & leptonica. | |||
| ++ lib.optionals enableTesseract [ tesseract leptonica ] | |||
| ++ lib.optional enableTbb tbb | |||
| ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox ] | |||
| ++ lib.optionals stdenv.isDarwin [ | |||
| bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate | |||
There was a problem hiding this comment.
Just for curiousity, why bzip2 is not "global", but restricted to Darwin?
There was a problem hiding this comment.
(I don't know these expressions, just trying to fix the biggest regressions.)
AndersonTorres
approved these changes
Apr 9, 2023
|
(seemed to WFM, macos 10.15) |
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.
I'm really just trying if it's trivial to avoid these regressions.
Things done
x86_64-linuxaarch64-linuxsandbox = 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/)