From bd3b4c54834e038e42c050b3486bfcf8d5ebdb6f Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> Date: Mon, 11 Apr 2022 22:47:41 +0000 Subject: [PATCH] qtwebengine: honor pipewireSupport (#161018) --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 01d0c5932828..3c5256908d88 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -12,7 +12,6 @@ , libcap , pciutils , systemd -, pipewire_0_2 , enableProprietaryCodecs ? true , gn , cctools, libobjc, libunwind, sandbox, xnu @@ -23,6 +22,8 @@ , lib, stdenv, fetchpatch , version ? null , qtCompatVersion +, pipewireSupport ? stdenv.isLinux +, pipewire_0_2 }: qtModule { @@ -137,7 +138,7 @@ qtModule { ''; qmakeFlags = [ "--" "-system-ffmpeg" ] - ++ lib.optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" + ++ lib.optional (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire" ++ lib.optional enableProprietaryCodecs "-proprietary-codecs"; propagatedBuildInputs = [ @@ -171,7 +172,7 @@ qtModule { xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.libXcomposite xorg.libXdamage libdrm xorg.libxkbfile - ] ++ lib.optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [ + ] ++ lib.optionals (pipewireSupport && (lib.versionAtLeast qtCompatVersion "5.15")) [ # Pipewire pipewire_0_2 ]