From bbdd169400b9ed49ca60db26157df9f0b44ec2d8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 11 Apr 2020 17:26:26 +0000 Subject: [PATCH] gst_all_1.gst-plugins-good: enable jack plugin (#84543) On Linux this adds two dependencies to the closure, libjack2 and celt, which increases its size from 163.5 MB to 164.4 MB. This should not cause any issues on macOS since jack supports it. --- .../development/libraries/gstreamer/good/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a7c2bcf838e..100d270673f 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -29,9 +29,7 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null - # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. - # In the future we should probably split `ffado`. -, enableJack ? false, jack2 +, enableJack ? true, libjack2 , libXdamage , libXext , libXfixes @@ -104,8 +102,8 @@ stdenv.mkDerivation rec { libavc1394 libiec61883 libgudev - ] ++ optionals (stdenv.isLinux && enableJack) [ - jack2 + ] ++ optionals enableJack [ + libjack2 ]; mesonFlags = [ @@ -113,8 +111,8 @@ stdenv.mkDerivation rec { "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps ] ++ optionals (!gtkSupport) [ "-Dgtk3=disabled" - ] ++ optionals (!stdenv.isLinux || !enableJack) [ - "-Djack=disabled" # unclear whether Jack works on Darwin + ] ++ optionals (!enableJack) [ + "-Djack=disabled" ] ++ optionals (!stdenv.isLinux) [ "-Ddv1394=disabled" # Linux only "-Doss4=disabled" # Linux only