Skip to content

chromium: add rtc_use_pipewire #89565

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

Merged
flokli merged 2 commits into from
Jun 7, 2020
Merged

chromium: add rtc_use_pipewire #89565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae468b
chromium: add rtc_use_pipewire
jsravn Jun 5, 2020
1535270
Add pipewire to runtime path
jsravn Jun 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
, jre
, pipewire_0_2
Copy link
Member

@flokli flokli Jun 6, 2020

Choose a reason for hiding this comment

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

Haven't yet built this, but are you sure this is pipewire_0_2 for all three channels?

I ran into some version incompatibility warnings when running pipewire 0.3 and google-chrome-stable (so I'd expect chrome to be built with pipewire_0_2, but beta and dev might use pipewire…

Copy link
Member

@flokli flokli Jun 6, 2020

Choose a reason for hiding this comment

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

We can't really check with chromiumBeta and chromiumDev, as they're broken currently on master, too: #89615

Copy link
Contributor Author

@jsravn jsravn Jun 6, 2020

Choose a reason for hiding this comment

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

Yes I'm fairly certain it uses pipewire_0_2. Other distros which enable this all build against pipewire 0.2 and from the chromium source it doesn't look like they've updated for 0.3.

Copy link
Contributor Author

@jsravn jsravn Jun 6, 2020

Choose a reason for hiding this comment

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

An easy way to test is to add the pipewire 0.3 runtime dependency to the binary packages and see if it can use it (when I try, it fails - it only works with pipewire 0.2).


# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
Expand Down Expand Up @@ -132,6 +133,7 @@ let
libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
jre
pipewire_0_2
] ++ optional useVaapi libva
++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
Expand Down Expand Up @@ -243,6 +245,8 @@ let
# added later in the wrapped -wv build or downloaded from Google.
enable_widevine = true;
use_cups = cupsSupport;
# Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture.
rtc_use_pipewire = true;

treat_warnings_as_errors = false;
is_clang = stdenv.cc.isClang;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/chromium/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
, makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire_0_2
, gcc, nspr, nss, patchelfUnstable, runCommand
, lib

Expand Down Expand Up @@ -152,7 +153,7 @@ in stdenv.mkDerivation {
buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
libPath = stdenv.lib.makeLibraryPath [ libva ];
libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ];

in with stdenv.lib; ''
mkdir -p "$out/bin"
Expand Down