alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/video/obs-studio/default.nix
View file

@ -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

4
pkgs/top-level/all-packages.nix
View file

@ -12087,7 +12087,9 @@ let
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 { };