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

obs-studio: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:18 +00:00
parent 23cfa1d290
commit be40fe7ae5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv
{ config, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
@ -26,9 +26,9 @@
, swig
, python3
, alsaSupport ? false
, alsaSupport ? stdenv.isLinux
, alsaLib
, pulseaudioSupport ? false
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio
}:

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

@ -18634,10 +18634,7 @@ in
obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
alsaSupport = stdenv.isLinux;
pulseaudioSupport = config.pulseaudio or true;
};
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { };
octoprint = callPackage ../applications/misc/octoprint { };