-
-
Notifications
You must be signed in to change notification settings - Fork 14.5k
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.
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
ffmpeg-livepeer: init at 7.0.1; livepeer: 0.5.20 -> 0.8.0 #354396
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
80f5e82
to
f1f7306
Compare
|
Does |
I do not think we should introduce yet more FFmpeg forks that will inevitably break when we update the FFmpeg derivation. The Hydra build failure looks related to FFmpeg 7.0, not 7.1, so if this is working with their FFmpeg 7.0 fork then I expect it would likely work with our FFmpeg 7.1. |
The test passes after adding this |
@emilazy The newest livepeer need their self ffmpeg. These are patch from upstream livepeer/FFmpeg#32. Another solution is just apply patch. The function |
Sorry, missed your edit when writing this comment. Applying the patches seems better than using the fork directly, but I think it’s still quite likely to break down the line. |
Not test. |
d4d89b4
to
a86a695
Compare
Ah, I recommended it without regard for what this app is. Headed |
@Atemu So now I switch to ffmpeg-headless and can be compiled. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Diff LGTM
@ofborg build ffmpeg-livepeer livepeer
6e27988
to
843d749
Compare
@ofborg build livepeer ffmpeg-livepeer |
(FYI: You don't need to rebase atop of master all the time, only when there's a conflict.) |
843d749
to
eafb3d6
Compare
@ofborg build livepeer ffmpeg-livepeer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise LGTM.
eafb3d6
to
4e91a43
Compare
buildInputs = | ||
old.buildInputs or [ ] | ||
++ lib.optionals stdenv.hostPlatform.isDarwin [ | ||
apple-sdk_11 | ||
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will becomme unnescessary after the current staging-next gets merged
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current staging-next is for 24.11, which still has the 10.12 SDK as the default on x86_64-darwin. The work to make the 11.3 SDK the default is still in progress and hasn’t been merged yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, right. ffmpeg is using the 15.0 SDK on stanging-next. My previous reply is correct in general but not relevant for ffmpeg.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we remove this and let this PR target staging-next then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't agree. It's now OK to merge. We should remove it when staging-next is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to release schedule (#339153) staging-next
is planned to be merged into master on the 12th of November (tomorrow)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It’s probably not going to be tomorrow because of events and happenings. We started a bit late because of builders catching fire. Probably a few more days, but I think it’s fine to wait until the merge rather than adding overrideAttrs
hacks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or, yes, just target this at staging-next
directly and then we can merge it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@emilazy Done. Now I remove apple-sdk_11.
4e91a43
to
57a0bb3
Compare
2e67253
to
e739e26
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ofborg build livepeer ffmpeg-livepeer
e739e26
to
d3f1f24
Compare
d3f1f24
to
a22d388
Compare
@ofborg build livepeer ffmpeg-livepeer |
Things done
ZHF: #352882
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.