From 033cfcce150fb295274a08c1e18dbdfd4ec110c5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 Jan 2021 22:08:35 +0100 Subject: alsa-plugins: don't build with libjack2 support when cross-compiling 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. --- pkgs/os-specific/linux/alsa-plugins/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/alsa-plugins/default.nix') diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index a69d86c5c4d..54d7ce6222a 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -15,13 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libogg ] ++ 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; { description = "Various plugins for ALSA"; homepage = "http://alsa-project.org/"; license = licenses.lgpl21; - maintainers = [maintainers.marcweber]; + maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; }; } -- cgit 1.4.1