From 134c7be40b4764a4f57ff546d5d594f20e3e9f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 26 Jun 2022 21:26:03 +1000 Subject: [PATCH] reaper: add support for pipewire-jack --- pkgs/applications/audio/reaper/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index d186755eccea..d3c0508aef97 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -11,8 +11,10 @@ , xdg-utils , which -, jackSupport ? true, libjack2 -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +, jackSupport ? true +, jackLibrary +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio }: stdenv.mkDerivation rec { @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ gtk3 # libSwell needs libgdk-3.so.0 ] - ++ lib.optional jackSupport libjack2 + ++ lib.optional jackSupport jackLibrary ++ lib.optional pulseaudioSupport libpulseaudio; dontBuild = true; @@ -79,6 +81,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer ]; + maintainers = with maintainers; [ jfrankenau ilian orivej uniquepointer viraptor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45a89043efa6..e6887e194fc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29577,7 +29577,9 @@ with pkgs; rdup = callPackage ../tools/backup/rdup { }; - reaper = callPackage ../applications/audio/reaper { }; + reaper = callPackage ../applications/audio/reaper { + jackLibrary = libjack2; # Another option is "pipewire.jack". + }; recapp = callPackage ../applications/video/recapp { };