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

Merge pull request #8496 from jb55/obs-studio-audio

Browse Source 
obs-studio: add audio support
This commit is contained in:
Arseniy Seroka
2015-06-26 00:59:05 +03:00
parent 5c537f3bdd 1281f51b69
commit 55d7d52d13
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/obs-studio/default.nix
+8 -2
View File
@@ -7,9 +7,14 @@
, qt5 , qt5
, libv4l , libv4l
, x264 , x264
, pulseaudioSupport ? false
, libpulseaudio
}: }:
stdenv.mkDerivation rec { let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}"; name = "obs-studio-${version}";
version = "0.10.0"; version = "0.10.0";
@@ -26,7 +31,8 @@ stdenv.mkDerivation rec {
qt5.base qt5.base
qt5.x11extras qt5.x11extras
x264 x264
]; ]
++ optional pulseaudioSupport libpulseaudio;
# obs attempts to dlopen libobs-opengl, it fails unless we make sure # 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 # DL_OPENGL is an explicit path. Not sure if there's a better way
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -12087,7 +12087,9 @@ let
inherit (gnome) libglade; inherit (gnome) libglade;
}; };
obs-studio = callPackage ../applications/video/obs-studio { }; obs-studio = callPackage ../applications/video/obs-studio {
pulseaudioSupport = config.pulseaudio or false;
};
ocrad = callPackage ../applications/graphics/ocrad { }; ocrad = callPackage ../applications/graphics/ocrad { };