Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ffmpeg_4: fix build error on darwin #123169

Merged
merged 1 commit into from May 16, 2021
Merged

ffmpeg_4: fix build error on darwin #123169

merged 1 commit into from May 16, 2021

Conversation

vs49688
Copy link
Contributor

@vs49688 vs49688 commented May 15, 2021

Motivation for this change

Fix build on Darwin.

ZHF: #122042

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 15, 2021
@vs49688 vs49688 mentioned this pull request May 15, 2021
Merged
4 tasks
@vcunat
Copy link
Member

vcunat commented May 16, 2021

@ofborg build ffmpeg

@vs49688 vs49688 marked this pull request as ready for review May 16, 2021 07:02
@vs49688 vs49688 requested a review from vcunat May 16, 2021 07:03
vcunat
vcunat approved these changes May 16, 2021
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment •
edited

Choose a reason for hiding this comment

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

Thanks. I just switched to applying the patch conditionally in 3e43d42.

vcunat added a commit that referenced this pull request May 16, 2021
@vcunat
Merge #123169: ffmpeg(_4): fix build error on darwin
e4d9759
@vcunat vcunat merged commit 8f64c5d into NixOS:staging-next May 16, 2021
@vs49688
Copy link
Contributor Author

vs49688 commented May 19, 2021

FYI, patch is now upstreamed and backported to 4.4.

@vs49688 vs49688 deleted the fffix2 branch August 21, 2021 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@vs49688 @vcunat