diff options
| author | Florian Klink <flokli@flokli.de> | 2020-06-07 21:13:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 21:13:28 +0200 |
| commit | 495cf5fd170b222f595e6b92421f4736379a4517 (patch) | |
| tree | df55964275f866da0c99b4639bfb0172c7a6cdd9 /pkgs | |
| parent | d5085910396b8e80d19e01ab3b7e85c3d3a7f158 (diff) | |
| parent | 1535270d91e82af7927c0f121f3f5605a0a7b248 (diff) | |
| download | nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar.gz nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar.bz2 nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar.lz nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar.xz nixlib-495cf5fd170b222f595e6b92421f4736379a4517.tar.zst nixlib-495cf5fd170b222f595e6b92421f4736379a4517.zip | |
Merge pull request #89565 from jsravn/enable-chromium-rtc-use-pipewire
chromium: add rtc_use_pipewire
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 34bac9716cc6..5b77551640e8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,6 +17,7 @@ , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre +, pipewire_0_2 # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -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 ] @@ -244,6 +246,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; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 9e46d061a308..2fea779a8f83 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 @@ -161,7 +162,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" |