From 4da422e269c3af48f0213689da26ac14e5f2c23d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 3 Apr 2023 09:20:28 -0700 Subject: [PATCH 1/2] scream: fix dependencies for `jackSupport` fixes #224467 --- pkgs/applications/audio/scream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 26e2b8e79f8b..735faba8f05b 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config , alsaSupport ? stdenv.isLinux, alsa-lib , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio -, jackSupport ? false, libjack2 +, jackSupport ? false, libjack2, soxr }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = lib.optional pulseSupport libpulseaudio - ++ lib.optional jackSupport libjack2 + ++ lib.optionals jackSupport [ libjack2 soxr ] ++ lib.optional alsaSupport alsa-lib; nativeBuildInputs = [ cmake pkg-config ]; From 8b601a118f40349c5507a0dee8366d0e32d6252c Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 3 Apr 2023 09:21:46 -0700 Subject: [PATCH 2/2] scream: optional `pcapSupport` --- pkgs/applications/audio/scream/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 735faba8f05b..6d2eae52e5e8 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -2,6 +2,7 @@ , alsaSupport ? stdenv.isLinux, alsa-lib , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio , jackSupport ? false, libjack2, soxr +, pcapSupport ? false, libpcap }: stdenv.mkDerivation rec { @@ -17,13 +18,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optional pulseSupport libpulseaudio ++ lib.optionals jackSupport [ libjack2 soxr ] - ++ lib.optional alsaSupport alsa-lib; + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pcapSupport libpcap; nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ "-DPULSEAUDIO_ENABLE=${if pulseSupport then "ON" else "OFF"}" "-DALSA_ENABLE=${if alsaSupport then "ON" else "OFF"}" "-DJACK_ENABLE=${if jackSupport then "ON" else "OFF"}" + "-DPCAP_ENABLE=${if pcapSupport then "ON" else "OFF"}" ]; cmakeDir = "../Receivers/unix";