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

alsa-plugins: don't build with libjack2 support when cross-compiling

Browse Source 
libjack2 doesn't cross-compile, see
https://github.com/NixOS/nixpkgs/issues/96548.

The pulseaudio NixOS module uses pkgs.alsaPlugins to create its
asound.conf, so let's make sure that one can be built when
cross-compiling.
This commit is contained in:
Florian Klink 2021-01-01 22:08:35 +01:00
parent c0a9361687
commit 033cfcce15
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/alsa-plugins/default.nix
View File

@ -15,13 +15,14 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ alsaLib libogg ] [ alsaLib libogg ]
++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libpulseaudio != null) libpulseaudio
++ lib.optional (libjack2 != null) libjack2; # https://github.com/NixOS/nixpkgs/issues/96548
++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2;
meta = with lib; { meta = with lib; {
description = "Various plugins for ALSA"; description = "Various plugins for ALSA";
homepage = "http://alsa-project.org/"; homepage = "http://alsa-project.org/";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = [maintainers.marcweber]; maintainers = [ maintainers.marcweber ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }