From ae98702f422e9e1a6339bff87a94cd6e48a4df1f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 26 Apr 2024 12:15:49 +0200 Subject: [PATCH] bambootracker,bambootracker-qt6: Switch from vendored to system-installed RtAudio 6 --- pkgs/applications/audio/bambootracker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 5ebc2caf0f71..5f955334fef2 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -8,7 +8,7 @@ , qtbase , qttools , qtwayland -, rtaudio +, rtaudio_6 , rtmidi , wrapQtAppsHook }: @@ -43,16 +43,16 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase + rtaudio_6 rtmidi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals (lib.versionAtLeast qtbase.version "6.0") [ qt5compat - ] ++ rtaudio.buildInputs; + ]; qmakeFlags = [ - # we don't have RtAudio 6 yet: https://github.com/NixOS/nixpkgs/pull/245075 - # "CONFIG+=system_rtaudio" + "CONFIG+=system_rtaudio" "CONFIG+=system_rtmidi" ];