diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 06:04:04 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-17 06:44:13 +0200 |
| commit | 75c66fb40ac01456e0ef3d865555a9a52b98cb4c (patch) | |
| tree | a55d91674916629e29cdeb3e0c19aac6ea1f96aa | |
| parent | 499195dfcffd9ab9063bd369bee0b85b7ef1f8ce (diff) | |
| download | nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar.gz nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar.bz2 nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar.lz nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar.xz nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.tar.zst nixpkgs-75c66fb40ac01456e0ef3d865555a9a52b98cb4c.zip | |
obs-studio: 0.13.1 -> 0.14.2
The biggest change is that since 0.14.0 it now has support for ALSA sound input, so this also adds the ALSA library to the dependencies. URL for upstream changes in 0.14.2: https://github.com/jp9000/obs-studio/releases/tag/0.14.2 URL for upstream changes in 0.14.0 and 0.14.1: https://github.com/jp9000/obs-studio/releases/tag/0.14.1 Changes for 0.13.3 and 0.13.4 were only Windows-related hotfixes, the URLs are: https://github.com/jp9000/obs-studio/releases/tag/0.13.3 https://github.com/jp9000/obs-studio/releases/tag/0.13.4 Upstream changes for 0.13.2: * Fixed an issue where certain devices (elgato/lgp/hdpvr) could have stuttering audio * Changed lossless recording quality to use .avi with uncompressed PCM audio data * Made it so that linux window capture does not display red when it can't capture, instead it now becomes transparent URL: https://github.com/jp9000/obs-studio/releases/tag/0.13.2 Built and tested successfully on my machine. Cc: @jb55 Reported-by: @rikai Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 93a52578db3..935c37d127e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -10,6 +10,8 @@ , x264 , curl +, alsaSupport ? false +, alsaLib , pulseaudioSupport ? false , libpulseaudio }: @@ -18,13 +20,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.13.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i"; + sha256 = "05yjm58d6daya1x6v8d73gx8fb20l0icay74nx0v4si2c898vm1j"; }; nativeBuildInputs = [ cmake @@ -39,6 +41,7 @@ in stdenv.mkDerivation rec { qtx11extras x264 ] + ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; # obs attempts to dlopen libobs-opengl, it fails unless we make sure diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fec9639c02..f3013074d17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13585,6 +13585,7 @@ in }; obs-studio = qt5.callPackage ../applications/video/obs-studio { + alsaSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or true; }; |