Skip to content

opencv, mpv: add Accelerate framework on darwin#225378

Merged
vcunat merged 2 commits intoNixOS:staging-nextfrom
vcunat:p/darwin-accelerate
Apr 9, 2023
Merged

opencv, mpv: add Accelerate framework on darwin#225378
vcunat merged 2 commits intoNixOS:staging-nextfrom
vcunat:p/darwin-accelerate

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Apr 9, 2023

I'm really just trying if it's trivial to avoid these regressions.

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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 9, 2023
@vcunat
Copy link
Member Author

vcunat commented Apr 9, 2023

@ofborg build opencv mpv-unwrapped

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 9, 2023
++ 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for curiousity, why bzip2 is not "global", but restricted to Darwin?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I don't know these expressions, just trying to fix the biggest regressions.)

@vcunat vcunat mentioned this pull request Apr 9, 2023
3 tasks
@vcunat vcunat merged commit 9359ecf into NixOS:staging-next Apr 9, 2023
@vcunat vcunat deleted the p/darwin-accelerate branch April 9, 2023 20:21
@risicle
Copy link
Contributor

risicle commented 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

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants