public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-studio: Qt 5 infrastructure update

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 20:15:34 -06:00
parent ccdbc22836
commit a0bae9b571
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/obs-studio/default.nix
View File

@ -4,7 +4,8 @@
, ffmpeg , ffmpeg
, jansson , jansson
, libxkbcommon , libxkbcommon
, qt5 , qtbase
, qtx11extras
, libv4l , libv4l
, x264 , x264
, curl , curl
@ -34,8 +35,8 @@ in stdenv.mkDerivation rec {
jansson jansson
libv4l libv4l
libxkbcommon libxkbcommon
qt5.base qtbase
qt5.x11extras qtx11extras
x264 x264
] ]
++ optional pulseaudioSupport libpulseaudio; ++ optional pulseaudioSupport libpulseaudio;

2
pkgs/top-level/all-packages.nix
View File

@ -12680,7 +12680,7 @@ let
inherit (gnome) libglade; inherit (gnome) libglade;
}; };
obs-studio = callPackage ../applications/video/obs-studio { obs-studio = qt5.callPackage ../applications/video/obs-studio {
pulseaudioSupport = config.pulseaudio or true; pulseaudioSupport = config.pulseaudio or true;
}; };