diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
| commit | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (patch) | |
| tree | 4df43f65ad5ba49f281d340c3012d63f5d37e8e9 /pkgs/os-specific/linux | |
| parent | c2884c4011a9496b67ae2ccd8af126854628014b (diff) | |
| parent | 279110cd86e9c969f8f2942675f7c73cfe4059d3 (diff) | |
| download | nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.gz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.bz2 nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.lz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.xz nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.tar.zst nixpkgs-fb2311d4307f9873ccd38c7f080fbf1df8f17daa.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-plugins/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
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; }; } |