From a0bae9b57118546ba4c3a53bdea8ab42a99b8a13 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Dec 2015 20:15:34 -0600 Subject: [PATCH] obs-studio: Qt 5 infrastructure update --- pkgs/applications/video/obs-studio/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 0bd0263005f5..2c2a26cc972c 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -4,7 +4,8 @@ , ffmpeg , jansson , libxkbcommon -, qt5 +, qtbase +, qtx11extras , libv4l , x264 , curl @@ -34,8 +35,8 @@ in stdenv.mkDerivation rec { jansson libv4l libxkbcommon - qt5.base - qt5.x11extras + qtbase + qtx11extras x264 ] ++ optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed317f1e176d..6af0468bc654 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12680,7 +12680,7 @@ let inherit (gnome) libglade; }; - obs-studio = callPackage ../applications/video/obs-studio { + obs-studio = qt5.callPackage ../applications/video/obs-studio { pulseaudioSupport = config.pulseaudio or true; };