Override libwebrtc build with vendored in-flight nixpkgs change #2
Conversation
This file contains hidden or 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
in buildInputs
This adds support for screen sharing on Wayland (fixes zed-industries#28754). libwebrtc replaces scap, which aims to be cross platform but was only used on Windows and X11. The X11 support relied on an out-of-tree branch on which the original author closed their own pull request (CapSoftware/scap#124). This also replaces Zed's platform-specific code on macOS. Switching to a single cross platform library simplifies the code by removing the need for Zed to have its own traits for cross platform abstraction.
jrobsonchase
force-pushed
the
libwebrtc_desktop_capture
branch
from
08571ea to
18b829b
Compare
Author
|
This is building, but now I've fully vendored the libwebrtc build from my nixpkgs PR. Probably not what we want long-term, but this at least works as a proof-of-concept. Going to keep pushing that nixpkgs pr forward, and keep this around for now, just in case there are unexpected issues getting it upstreamed and we do end up needing to own the build. |
jrobsonchase
force-pushed
the
libwebrtc_desktop_capture
branch
from
18b829b to
cd23c6b
Compare
jrobsonchase
changed the title
Author
|
Figured out all the build problems and cleaned this up. Now it's just a |
jrobsonchase
force-pushed
the
libwebrtc_desktop_capture
branch
from
7d21814 to
db404c1
Compare
jrobsonchase
force-pushed
the
libwebrtc_desktop_capture
branch
from
db404c1 to
25494d5
Compare
Be-ing
force-pushed
the
libwebrtc_desktop_capture
branch
from
71ca6c4 to
969fb8f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Added an override to livekit-libwebrtc to include the build changes here and here as mentioned in this comment, which are currently in-flight in the nixpkgs PR referenced in the main desktop capture PR.
Everything seems to build, but I haven't had a chance to test it out yet.
If merged, we should delete the vendored build ASAP (once the update hits nixpkgs-unstable).
Alternatively, we can just use this to test things and make sure it's all good, and wait until the package hits nixpkgs-unstable to merge the parent PR.