From 85020dcbda5ec9697e0906cb8e011006fd8573e2 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 19 Apr 2022 23:20:59 +0900 Subject: [PATCH] qtmultimedia: restrict libpulseaudio to linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libpulseaudio doesn't currently build on darwin after a recent upgrade (#160097). When looking closely at the darwin build, it appeared that it wasn't being used at all. ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt512.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt514.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no ❯ nix log $(nix-build --no-out-link channel:nixpkgs-unstable --argstr system x86_64-darwin -A qt515.qtmultimedia) | grep PulseAudio Checking for PulseAudio >= 0.9.10... no PulseAudio ............................. no --- pkgs/development/libraries/qt-5/modules/qtmultimedia.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix index baf5c30e73c4..41a7eb6776c3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix @@ -15,8 +15,9 @@ qtModule { pname = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gstreamer gst-plugins-base libpulseaudio ] - ++ lib.optional (stdenv.isLinux) alsa-lib + buildInputs = [ gstreamer gst-plugins-base ] + # https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio + ++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ] ++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland; outputs = [ "bin" "dev" "out" ]; qmakeFlags = [ "GST_VERSION=1.0" ];