cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169365 from primeos/chromium

Browse source 
chromium: Fix Wayland screen sharing
This commit is contained in:
Michael Weiss 2022-04-20 21:24:38 +02:00 committed by GitHub
commit 3edae19be4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -61,6 +61,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.
@ -162,7 +169,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