public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89565 from jsravn/enable-chromium-rtc-use-pipewire

Browse Source 
chromium: add rtc_use_pipewire
This commit is contained in:
Florian Klink 2020-06-07 21:13:28 +02:00 committed by GitHub
commit 495cf5fd17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

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

3
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -2,6 +2,7 @@
, makeWrapper, ed , makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, pipewire_0_2
, gcc, nspr, nss, patchelfUnstable, runCommand , gcc, nspr, nss, patchelfUnstable, runCommand
, lib , lib
@ -161,7 +162,7 @@ in stdenv.mkDerivation {
buildCommand = let buildCommand = let
browserBinary = "${chromiumWV}/libexec/chromium/chromium"; browserBinary = "${chromiumWV}/libexec/chromium/chromium";
getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
libPath = stdenv.lib.makeLibraryPath [ libva ]; libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ];
in with stdenv.lib; '' in with stdenv.lib; ''
mkdir -p "$out/bin" mkdir -p "$out/bin"