From 8b9ff564c767fb2f4a9a8b81dc93a38d83154863 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 8 Feb 2021 14:49:10 +0000
Subject: [PATCH 1/2] libjack2: fix cross

Always defaults to unprefixed pkg-config, even when cross-compiling.

Fixes: https://github.com/NixOS/nixpkgs/issues/96548
---
 pkgs/misc/jackaudio/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 24d2b5e135c..9dd97367441 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
         --replace /bin/bash ${bash}/bin/bash
   '';
 
+  PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config";
+
+  dontAddWafCrossFlags = "true";
   wafConfigureFlags = [
     "--classic"
     "--autostart=${if (optDbus != null) then "dbus" else "classic"}"

From 1690c5ddf8aad602fc5758de21f6c035f5930a79 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 8 Feb 2021 14:53:37 +0000
Subject: [PATCH 2/2] Revert "alsa-plugins: don't build with libjack2 support
 when cross-compiling"

This reverts commit 033cfcce150fb295274a08c1e18dbdfd4ec110c5, which is
no longer necessary because libjack2 can now be cross-compiled.
---
 pkgs/os-specific/linux/alsa-plugins/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 602d4278183..09dbdbc9b6f 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ alsaLib libogg ]
     ++ lib.optional (libpulseaudio != null) libpulseaudio
-    # https://github.com/NixOS/nixpkgs/issues/96548
-    ++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2;
+    ++ lib.optional (libjack2 != null) libjack2;
 
   meta = with lib; {
     description = "Various plugins for ALSA";