From 26dab21459aebe8350733f609df21146935494d6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 26 Apr 2024 11:58:48 +0200 Subject: [PATCH 1/3] rtaudio_6: init at 6.0.1 --- pkgs/by-name/rt/rtaudio_6/package.nix | 49 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/by-name/rt/rtaudio_6/package.nix diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix new file mode 100644 index 000000000000..9f8b03f3c002 --- /dev/null +++ b/pkgs/by-name/rt/rtaudio_6/package.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, config +, fetchFromGitHub +, cmake +, pkg-config +, alsaSupport ? stdenv.hostPlatform.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux +, libpulseaudio +, jackSupport ? true +, jack +, coreaudioSupport ? stdenv.hostPlatform.isDarwin +, CoreAudio +}: + +stdenv.mkDerivation rec { + pname = "rtaudio"; + version = "6.0.1"; + + src = fetchFromGitHub { + owner = "thestk"; + repo = "rtaudio"; + rev = version; + sha256 = "11llxdg62gs6l2zc473s9zfb8jczflyq1dd0k0wfcmvyg5p33jq1"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional jackSupport jack + ++ lib.optional coreaudioSupport CoreAudio; + + cmakeFlags = [ + "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_PULSE=${if pulseaudioSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_JACK=${if jackSupport then "ON" else "OFF"}" + "-DRTAUDIO_API_CORE=${if coreaudioSupport then "ON" else "OFF"}" + ]; + + meta = with lib; { + description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; + homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; + license = licenses.mit; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c5051bdf790..51016d6e6836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12289,6 +12289,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; }; + rtaudio_6 = callPackage ../by-name/rt/rtaudio_6/package.nix { + jack = libjack2; + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; + rtmidi = callPackage ../development/libraries/audio/rtmidi { jack = libjack2; inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices; From ae98702f422e9e1a6339bff87a94cd6e48a4df1f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 26 Apr 2024 12:15:49 +0200 Subject: [PATCH 2/3] 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" ]; From 15392f7b82af44784fb142a7de96761db0be6d99 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 29 Apr 2024 15:58:35 +0200 Subject: [PATCH 3/3] rtaudio_6: Modernise Some (but not all) changes: - finalAttrs - strictDeps - SRI hash - lib.cmakeBool flags - meta changelog & pkgConfigModules - pkg-config test --- pkgs/by-name/rt/rtaudio_6/package.nix | 61 ++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 5 --- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/rt/rtaudio_6/package.nix b/pkgs/by-name/rt/rtaudio_6/package.nix index 9f8b03f3c002..f00788782fba 100644 --- a/pkgs/by-name/rt/rtaudio_6/package.nix +++ b/pkgs/by-name/rt/rtaudio_6/package.nix @@ -2,6 +2,7 @@ , lib , config , fetchFromGitHub +, testers , cmake , pkg-config , alsaSupport ? stdenv.hostPlatform.isLinux @@ -9,41 +10,59 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , jackSupport ? true -, jack +, libjack2 , coreaudioSupport ? stdenv.hostPlatform.isDarwin -, CoreAudio +, darwin +, validatePkgConfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtaudio"; version = "6.0.1"; src = fetchFromGitHub { owner = "thestk"; repo = "rtaudio"; - rev = version; - sha256 = "11llxdg62gs6l2zc473s9zfb8jczflyq1dd0k0wfcmvyg5p33jq1"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Acsxbnl+V+Y4mKC1gD11n0m03E96HMK+oEY/YV7rlIY="; }; - nativeBuildInputs = [ cmake pkg-config ]; + strictDeps = true; - buildInputs = lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional jackSupport jack - ++ lib.optional coreaudioSupport CoreAudio; - - cmakeFlags = [ - "-DRTAUDIO_API_ALSA=${if alsaSupport then "ON" else "OFF"}" - "-DRTAUDIO_API_PULSE=${if pulseaudioSupport then "ON" else "OFF"}" - "-DRTAUDIO_API_JACK=${if jackSupport then "ON" else "OFF"}" - "-DRTAUDIO_API_CORE=${if coreaudioSupport then "ON" else "OFF"}" + nativeBuildInputs = [ + cmake + pkg-config + validatePkgConfig ]; - meta = with lib; { + buildInputs = lib.optionals alsaSupport [ + alsa-lib + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ] ++ lib.optionals jackSupport [ + libjack2 + ] ++ lib.optionals coreaudioSupport [ + darwin.apple_sdk.frameworks.CoreAudio + ]; + + cmakeFlags = [ + (lib.cmakeBool "RTAUDIO_API_ALSA" alsaSupport) + (lib.cmakeBool "RTAUDIO_API_PULSE" pulseaudioSupport) + (lib.cmakeBool "RTAUDIO_API_JACK" jackSupport) + (lib.cmakeBool "RTAUDIO_API_CORE" coreaudioSupport) + ]; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { description = "A set of C++ classes that provide a cross platform API for realtime audio input/output"; homepage = "https://www.music.mcgill.ca/~gary/rtaudio/"; - license = licenses.mit; - maintainers = with maintainers; [ magnetophon ]; - platforms = platforms.unix; + changelog = "https://github.com/thestk/rtaudio/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ magnetophon ]; + platforms = lib.platforms.unix; + pkgConfigModules = [ + "rtaudio" + ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51016d6e6836..2c5051bdf790 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12289,11 +12289,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio; }; - rtaudio_6 = callPackage ../by-name/rt/rtaudio_6/package.nix { - jack = libjack2; - inherit (darwin.apple_sdk.frameworks) CoreAudio; - }; - rtmidi = callPackage ../development/libraries/audio/rtmidi { jack = libjack2; inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices;