gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtmultimedia: restrict libpulseaudio to linux

Browse Source 
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
This commit is contained in:
Andrew Childs
2022-04-20 00:01:14 +03:00
committed by Artturin
parent e22337c870
commit 85020dcbda
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+3 -2
View File
@@ -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" ];