diff options
| author | Artturi <Artturin@artturin.com> | 2022-04-21 03:41:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 03:41:32 +0300 |
| commit | 9887f024766aa27704d1f89f623efd1d063da92a (patch) | |
| tree | 4a40ad4232ad700b6649b3649733fe34c4f3b475 | |
| parent | Merge pull request #169439 from NixOS/backport-169066-to-release-21.11 (diff) | |
| parent | chromium: Fix Wayland screen sharing (diff) | |
| download | nixpkgs-9887f024766aa27704d1f89f623efd1d063da92a.tar.gz | |
Merge pull request #169476 from NixOS/backport-169365-to-release-21.11
[Backport release-21.11] chromium: Fix Wayland screen sharing
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a9532f517eb1..a309189ba27b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -63,6 +63,13 @@ let url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l"; }; + # https://webrtc-review.googlesource.com/c/src/+/255601 + webrtcWaylandScreenshareCoredumpFix = fetchurl { + # PipeWire capturer: check existence of cursor metadata + name = "webrtc-wayland-screenshare-coredump-fix.patch"; + url = "https://webrtc-review.googlesource.com/changes/src~255601/revisions/2/patch?download"; + hash = "sha256-PHGwEoYhMa+ZL2ner10FwdGUWUxsVr+HWuZOAEugYDY="; + }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -166,7 +173,9 @@ let ./patches/widevine-79.patch ]; - postPatch = '' + postPatch = optionalString (versionRange "100" "101") '' + base64 --decode ${webrtcWaylandScreenshareCoredumpFix} | patch -p1 -d third_party/webrtc + '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then |