mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-29 16:40:18 +02:00
Merge pull request #114979 from primeos/chromium-pipewire-0.3
chromium: Switch from PipeWire 0.2 to the current 0.3.x releases
This commit is contained in:
commit
dc8eacfba0
|
@ -17,7 +17,7 @@
|
||||||
, protobuf, speechd, libXdamage, cups
|
, protobuf, speechd, libXdamage, cups
|
||||||
, ffmpeg, libxslt, libxml2, at-spi2-core
|
, ffmpeg, libxslt, libxml2, at-spi2-core
|
||||||
, jre8
|
, jre8
|
||||||
, pipewire_0_2
|
, pipewire
|
||||||
, libva
|
, libva
|
||||||
, libdrm, wayland, mesa, libxkbcommon # Ozone
|
, libdrm, wayland, mesa, libxkbcommon # Ozone
|
||||||
|
|
||||||
|
@ -140,7 +140,7 @@ let
|
||||||
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
|
||||||
pciutils protobuf speechd libXdamage at-spi2-core
|
pciutils protobuf speechd libXdamage at-spi2-core
|
||||||
jre
|
jre
|
||||||
pipewire_0_2
|
pipewire
|
||||||
libva
|
libva
|
||||||
libdrm wayland mesa.drivers libxkbcommon
|
libdrm wayland mesa.drivers libxkbcommon
|
||||||
] ++ optional gnomeKeyringSupport libgnome-keyring3
|
] ++ optional gnomeKeyringSupport libgnome-keyring3
|
||||||
|
@ -263,6 +263,7 @@ let
|
||||||
use_pulseaudio = true;
|
use_pulseaudio = true;
|
||||||
link_pulseaudio = true;
|
link_pulseaudio = true;
|
||||||
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
} // optionalAttrs (chromiumVersionAtLeast "89") {
|
||||||
|
rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90
|
||||||
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
# Disable PGO (defaults to 2 since M89) because it fails without additional changes:
|
||||||
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
# error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
|
||||||
chrome_pgo_phase = 0;
|
chrome_pgo_phase = 0;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
|
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
|
||||||
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
|
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
|
||||||
, libva ? null
|
, libva ? null
|
||||||
, pipewire_0_2
|
, pipewire
|
||||||
, gcc, nspr, nss, runCommand
|
, gcc, nspr, nss, runCommand
|
||||||
, lib
|
, lib
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
buildCommand = let
|
buildCommand = let
|
||||||
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
|
browserBinary = "${chromiumWV}/libexec/chromium/chromium";
|
||||||
libPath = lib.makeLibraryPath [ libva pipewire_0_2 ];
|
libPath = lib.makeLibraryPath [ libva pipewire ];
|
||||||
|
|
||||||
in with lib; ''
|
in with lib; ''
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
|
|
Loading…
Reference in a new issue