git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #124078 from flokli/qtwebengine-conditional-pipewire

qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15

commitac078761cef8415cbc7666b0769434c45e1cd35d authorFlorian Klink <flokli@flokli.de> dateSun 23 May 2021, 12:36 (5 years ago) parentbda6a9c4cbb204
1 file changed+2−1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+2−1
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+2−1
@@ -134,7 +134,7 @@ qtModule {
134134 '';
135135
136136 qmakeFlags = [ "--" "-system-ffmpeg" ]
137− ++ optional stdenv.isLinux "-webengine-webrtc-pipewire"
137+ ++ optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire"
138138 ++ optional enableProprietaryCodecs "-proprietary-codecs";
139139
140140 propagatedBuildInputs = [
@@ -168,6 +168,7 @@ qtModule {
168168 xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
169169 xorg.libXcomposite xorg.libXdamage libdrm
170170
171+ ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [
171172 # Pipewire
172173 pipewire_0_2
173174 ]