Merge master into staging

2019-07-25 09:23:01 +00:00
parent aabb651b23 b5d1d50aa9
commit 32fbbc6f9b
193 changed files with 4440 additions and 1950 deletions
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
  ]
  ++ optional gtkSupport gtk3 # for gtksink
  ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
-  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev jack2 ]
+  ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ]
  ++ optionals (stdenv.isLinux && enableJack) [
    jack2
  ];