diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 18:54:59 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-13 18:54:59 +0200 |
commit | b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1 (patch) | |
tree | 18bccee304932e7a3d64e3e49f48f2eadcf958a5 /pkgs/development/libraries/gstreamer | |
parent | a98668b67dda7dbeb632285cb19c9074f143c954 (diff) | |
parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
download | nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar.gz nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar.bz2 nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar.lz nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar.xz nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.tar.zst nixpkgs-b4a6714571724b1bdc99a6cbfdb9c45608ba1bf1.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
9 files changed, 13 insertions, 15 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 diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 402074a4e5f..804d80b8e1d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gstreamer ]; meta = { - homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; + homepage = "https://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index 77465645d23..cd37a513184 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index eed9d423fdb..ad978e903f8 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 2b78d4daaf3..225bcc7e263 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 2f46016adac..5321fc379cc 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index c8414a7b681..4c56039bd0a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index e69e584b23d..b78f6148e48 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Library for constructing graphs of media-handling components"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 27036ad86ed..24197b04b73 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = https://www.gtkmm.org/; + homepage = "https://www.gtkmm.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ plcplc ]; platforms = platforms.unix; |