git.iko.soy/typeable/nixpkgs
on master help sign in
qtwebengine: only set -webengine-webrtc-pipewire with qt >= 5.15

This fails the build of qt514.qtwebengine otherwise: ``` QMAKEPATH=/nix/store/29n056mi3pji6si51b128pa67b1qr7wq-qtbase-5.14.2-dev:/nix/store/g7wady1f1r23wlmy4q1f3b8j2fj5q2sq-qtdeclarative-dev:/nix/store/xfqnh2pma99915d4gsanls68z1jikcpx-qtsvg-dev:/nix/store/zlnsjdj5yv1ivi1miq49j9gp382byl35-qtlocation-dev:/nix/store/lb7cidi60cabpa7swv51xnss9045vqzi-qtmultimedia-dev:/nix/store/jrk6bcqihxwsszwy6rwy2vnfc2sb4rv9-qtwebchannel-dev qmake PREFIX=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_OUT=/nix/store/pa3jhipp59f6ykh9k8l8z8jf88k52bz8-qtwebengine NIX_OUTPUT_DEV=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev NIX_OUTPUT_BIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin NIX_OUTPUT_DOC=/nix/store/jngs3qilw9iiv97rawb9sb9sd6qdbp2s-qtwebengine-dev/share/doc/qt-5.14.2 NIX_OUTPUT_QML=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/qml NIX_OUTPUT_PLUGIN=/nix/store/91hqv88qvg2wb91lv1h1pd4d8wwrkd5d-qtwebengine-bin/lib/qt-5.14.2/plugins CONFIG+=release -- -system-ffmpeg -webengine-webrtc-pipewire -proprietary-codecs Info: creating stash file /build/qtwebengine-everywhere-src-5.14.2/.qmake.stash Info: creating cache file /build/qtwebengine-everywhere-src-5.14.2/.qmake.cache ERROR: Unknown command line option '-webengine-webrtc-pipewire'. builder for '/nix/store/g6dvr7789sswmahlxc6zs5pr8k2g5pgy-qtwebengine.drv' failed with exit code 3 ``` Also, only bring in pipewire_0_2 if we enable pipewire support.

commit4cbb20402a88abee9a68b53a8786df5af87b4101 authorFlorian Klink <flokli@flokli.de> dateSun 23 May 2021, 00:26 (5 years ago) parentaea7b5f
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
@@ -142,7 +142,7 @@ qtModule {
142142 '';
143143
144144 qmakeFlags = [ "--" "-system-ffmpeg" ]
145− ++ optional stdenv.isLinux "-webengine-webrtc-pipewire"
145+ ++ optional (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) "-webengine-webrtc-pipewire"
146146 ++ optional enableProprietaryCodecs "-proprietary-codecs";
147147
148148 propagatedBuildInputs = [
@@ -176,6 +176,7 @@ qtModule {
176176 xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
177177 xorg.libXcomposite xorg.libXdamage libdrm
178178
179+ ] ++ optionals (stdenv.isLinux && (lib.versionAtLeast qtCompatVersion "5.15")) [
179180 # Pipewire
180181 pipewire_0_2
181182 ]