Merge branch 'master.upstream' into staging.upstream

2 files changed, 12 insertions, 6 deletions

diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix
index ad5dc58cbebb4..70558eb39a4cb 100644
--- a/pkgs/applications/video/k9copy/default.nix
+++ b/pkgs/applications/video/k9copy/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, automoc4, kf5, dvdauthor, xineLib, libmpeg2, libav,
-libdvdread, libdvdnav, dvdplusrwtools }:
+{ stdenv, fetchurl, cmake, automoc4, qt5, kf5, dvdauthor, xineLib, libmpeg2, libav,
+libdvdread, libdvdnav, dvdplusrwtools, phonon_qt5 }:
 
 stdenv.mkDerivation rec {
   version = "3.0.3";
@@ -31,12 +31,12 @@ stdenv.mkDerivation rec {
     libdvdnav
     dvdplusrwtools
     automoc4
+    phonon_qt5
   ] ++ (with kf5; [
     extra-cmake-modules
     kio
     solid
-    scope.Phonon4Qt5
-    scope.Qt5X11Extras
+    qt5.x11extras
     kiconthemes
     ki18n
     kdesu
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 894a51c58ccea..953f0c3a8b234 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -7,9 +7,14 @@
 , qt5
 , libv4l
 , x264
+
+, pulseaudioSupport ? false
+, libpulseaudio
 }:
 
-stdenv.mkDerivation rec {
+let
+  optional = stdenv.lib.optional;
+in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
   version = "0.10.0";
 
@@ -26,7 +31,8 @@ stdenv.mkDerivation rec {
                   qt5.base
                   qt5.x11extras
                   x264
-                ];
+                ]
+                ++ optional pulseaudioSupport libpulseaudio;
 
   # obs attempts to dlopen libobs-opengl, it fails unless we make sure
   # DL_OPENGL is an explicit path. Not sure if there's a better way